diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 69d3afa92d..984792fc91 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,5 +1,10 @@
+file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar
+file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar
+file.reference.metadata-extractor-2.6.2.jar=release/modules/ext/metadata-extractor-2.6.2.jar
 file.reference.sqlite-jdbc-3.8.0-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar
+file.reference.tika-core-1.2.jar=release/modules/ext/tika-core-1.2.jar
 file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
+file.reference.xmpcore.jar=release/modules/ext/xmpcore.jar
 javac.source=1.7
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 7dd5bfd278..a70456a44a 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -207,6 +207,26 @@
                 <package>org.sleuthkit.autopsy.report</package>
                 <package>org.sleuthkit.datamodel</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmpcore.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmpcore.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-2.0.5-contrib.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-2.0.5-contrib.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
@@ -215,6 +235,14 @@
                 <runtime-relative-path>ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/metadata-extractor-2.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/metadata-extractor-2.6.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-core-1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-core-1.2.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/Timeline/release/mactime/mactime.exe b/Core/release/mactime/mactime.exe
similarity index 100%
rename from Timeline/release/mactime/mactime.exe
rename to Core/release/mactime/mactime.exe
diff --git a/ExifParser/release/modules/ext/LICENSE-2.0.txt b/Core/release/modules/ext/LICENSE-2.0.txt
similarity index 100%
rename from ExifParser/release/modules/ext/LICENSE-2.0.txt
rename to Core/release/modules/ext/LICENSE-2.0.txt
diff --git a/ExifParser/release/modules/ext/README.txt b/Core/release/modules/ext/README.txt
similarity index 100%
rename from ExifParser/release/modules/ext/README.txt
rename to Core/release/modules/ext/README.txt
diff --git a/Core/release/modules/ext/jdom-2.0.5-contrib.jar b/Core/release/modules/ext/jdom-2.0.5-contrib.jar
new file mode 100644
index 0000000000..7432b751a3
Binary files /dev/null and b/Core/release/modules/ext/jdom-2.0.5-contrib.jar differ
diff --git a/Core/release/modules/ext/jdom-2.0.5.jar b/Core/release/modules/ext/jdom-2.0.5.jar
new file mode 100644
index 0000000000..b6996c725a
Binary files /dev/null and b/Core/release/modules/ext/jdom-2.0.5.jar differ
diff --git a/ExifParser/release/modules/ext/metadata-extractor-2.6.2.jar b/Core/release/modules/ext/metadata-extractor-2.6.2.jar
old mode 100644
new mode 100755
similarity index 100%
rename from ExifParser/release/modules/ext/metadata-extractor-2.6.2.jar
rename to Core/release/modules/ext/metadata-extractor-2.6.2.jar
diff --git a/SevenZip/release/modules/ext/sevenzipjbinding-AllPlatforms.jar b/Core/release/modules/ext/sevenzipjbinding-AllPlatforms.jar
old mode 100644
new mode 100755
similarity index 100%
rename from SevenZip/release/modules/ext/sevenzipjbinding-AllPlatforms.jar
rename to Core/release/modules/ext/sevenzipjbinding-AllPlatforms.jar
diff --git a/SevenZip/release/modules/ext/sevenzipjbinding.jar b/Core/release/modules/ext/sevenzipjbinding.jar
old mode 100644
new mode 100755
similarity index 100%
rename from SevenZip/release/modules/ext/sevenzipjbinding.jar
rename to Core/release/modules/ext/sevenzipjbinding.jar
diff --git a/FileTypeId/release/modules/ext/tika-core-1.2.jar b/Core/release/modules/ext/tika-core-1.2.jar
old mode 100644
new mode 100755
similarity index 100%
rename from FileTypeId/release/modules/ext/tika-core-1.2.jar
rename to Core/release/modules/ext/tika-core-1.2.jar
diff --git a/ExifParser/release/modules/ext/xmpcore.jar b/Core/release/modules/ext/xmpcore.jar
old mode 100644
new mode 100755
similarity index 100%
rename from ExifParser/release/modules/ext/xmpcore.jar
rename to Core/release/modules/ext/xmpcore.jar
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index 2151fafa49..cf80037c2c 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -48,3 +48,4 @@ GetTagNameDialog.unableToAddTagNameToCase.msg=Unable to add the {0} tag name to
 GetTagNameDialog.taggingErr=Tagging Error
 GetTagNameDialog.tagNameAlreadyDef.msg=A {0} tag name has already been defined.
 GetTagNameDialog.dupTagErr=Duplicate Tag Error
+OpenLogFolder.error1=Log File Not Found: {0}
diff --git a/Core/src/org/sleuthkit/autopsy/actions/OpenLogFolderAction.java b/Core/src/org/sleuthkit/autopsy/actions/OpenLogFolderAction.java
new file mode 100755
index 0000000000..9276a747f9
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/actions/OpenLogFolderAction.java
@@ -0,0 +1,64 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.modules.Places;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle.Messages;
+
+@ActionID(
+        category = "Help",
+        id = "org.sleuthkit.autopsy.actions.OpenLogFolder")
+@ActionRegistration(
+        displayName = "#CTL_OpenLogFolder")
+@ActionReference(path = "Menu/Help", position = 1750)
+@Messages("CTL_OpenLogFolder=Open Log Folder")
+/**
+ * Action in menu to open the folder containing the log files
+ */
+public final class OpenLogFolderAction implements ActionListener {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        try {
+            File logDir = new File(Places.getUserDirectory().getAbsolutePath() + File.separator + "var" + File.separator + "log");
+            if (logDir.exists() == false) {
+                NotifyDescriptor d =
+                        new NotifyDescriptor.Message(
+                        java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/actions/Bundle").getString("OpenLogFolder.error1"), new Object[]{logDir.getAbsolutePath()}),
+                        NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notify(d);
+            } else {
+                Desktop.getDesktop().open(logDir);
+            }
+        } catch (IOException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 6e8d10bac8..0a0d481991 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -122,8 +122,13 @@
         </folder>
         <folder name="Help">
             <file name="org-netbeans-core-actions-AboutAction.instance_hidden"/>
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.CustomAboutAction"/>
+            <file name="org-sleuthkit-autopsy-actions-OpenLogFolder.instance_hidden"/>
+            <file name="org-sleuthkit-autopsy-actions-OpenLogFolderAction.instance">
+                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+                <attr name="noIconInMenu" boolvalue="false"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-corecomponents-AboutWindowAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.AboutWindowAction"/>
                 <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_CustomAboutAction"/>
                 <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
                 <attr name="noIconInMenu" boolvalue="false"/>
@@ -260,7 +265,7 @@
             <file name="org-netbeans-modules-autoupdate-ui-actions-CheckForUpdatesAction.shadow_hidden"/>
             <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
             <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance"/>
+                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-AboutWindowAction.instance"/>
                 <attr name="position" intvalue="3000"/>
             </file>
         </folder>
@@ -317,6 +322,12 @@
             <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.FileReportText.getDefault"/>
             <attr name="position" intvalue="903"/>
         </file>
+        <file name="org-sleuthkit-autopsy-report-ReportKML.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportKML.getDefault"/>
+            <attr name="position" intvalue="904"/>
+        </file>
+        
         <!--<folder name="JavaHelp">
             <file name="casemodule-helpset.xml" url="casemodule-helpset.xml">
                 <attr name="position" intvalue="3075"/>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
index 8fd75651e5..1ecea43720 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
@@ -28,16 +28,16 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Action to open custom implementation of the "About" window from the Help menu.
  */
- class CustomAboutAction extends AboutAction {
+ class AboutWindowAction extends AboutAction {
 
     @Override
     public void performAction() {
         Logger.noteAction(this.getClass());
 
-        ProductInformationPanel pip = new ProductInformationPanel();
+        AboutWindowPanel pip = new AboutWindowPanel();
         DialogDescriptor descriptor = new DialogDescriptor(
                 pip,
-                NbBundle.getMessage(CustomAboutAction.class, "CTL_CustomAboutAction"),
+                NbBundle.getMessage(AboutWindowAction.class, "CTL_CustomAboutAction"),
                 true,
                 new Object[0],
                 null,
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.form
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.form
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
index 81ad1dd840..a553a08954 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
@@ -35,7 +35,6 @@ import org.netbeans.core.actions.HTMLViewAction;
 import org.openide.awt.HtmlBrowser;
 import org.openide.modules.Places;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.datamodel.SleuthkitJNI;
@@ -43,17 +42,17 @@ import org.sleuthkit.datamodel.SleuthkitJNI;
 /**
  * Custom "About" window panel.
  */
-public class ProductInformationPanel extends JPanel implements HyperlinkListener {
+public class AboutWindowPanel extends JPanel implements HyperlinkListener {
 
     private URL url = null;
     private Icon about;
     private boolean verboseLogging;
 
-    public ProductInformationPanel() {
+    public AboutWindowPanel() {
         about = new ImageIcon(org.netbeans.core.startup.Splash.loadContent(true));
         initComponents();
         jLabel1.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        description.setText(org.openide.util.NbBundle.getMessage(ProductInformationPanel.class,
+        description.setText(org.openide.util.NbBundle.getMessage(AboutWindowPanel.class,
                 "LBL_Description", new Object[]{getProductVersionValue(), getJavaValue(), getVMValue(),
                     getOperatingSystemValue(), getEncodingValue(), getSystemLocaleValue(), getUserDirValue(), getSleuthKitVersionValue(), Version.getNetbeansBuild(), Version.getBuildType().toString()}));
         description.addHyperlinkListener(this);
@@ -96,7 +95,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         copyright.setBorder(null);
         copyright.setContentType("text/html"); // NOI18N
         copyright.setEditable(false);
-        copyright.setText(org.openide.util.NbBundle.getBundle(ProductInformationPanel.class).getString("LBL_Copyright")); // NOI18N
+        copyright.setText(org.openide.util.NbBundle.getBundle(AboutWindowPanel.class).getString("LBL_Copyright")); // NOI18N
         copyright.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 copyrightMouseClicked(evt);
@@ -109,8 +108,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         jScrollPane2.setViewportView(description);
 
         verboseLoggingButton.setBackground(new java.awt.Color(255, 255, 255));
-        verboseLoggingButton.setText(
-                NbBundle.getMessage(this.getClass(), "ProductInformationPanel.actVerboseLogging.text"));
+        verboseLoggingButton.setText("Activate verbose logging");
         verboseLoggingButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 activateVerboseLogging(evt);
@@ -118,7 +116,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         });
 
         jButton2.setBackground(new java.awt.Color(255, 255, 255));
-        jButton2.setText(NbBundle.getMessage(ProductInformationPanel.class, "LBL_Close")); // NOI18N
+        jButton2.setText(NbBundle.getMessage(AboutWindowPanel.class, "LBL_Close")); // NOI18N
         jButton2.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jButton2ActionPerformed(evt);
@@ -172,7 +170,7 @@ private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
 private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
     try {
-        url = new URL(NbBundle.getMessage(ProductInformationPanel.class, "URL_ON_IMG")); // NOI18N
+        url = new URL(NbBundle.getMessage(AboutWindowPanel.class, "URL_ON_IMG")); // NOI18N
         showUrl();
     } catch (MalformedURLException ex) {
         //ignore
@@ -226,29 +224,29 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
     }
 
     private static String getOperatingSystemValue() {
-        return NbBundle.getMessage(ProductInformationPanel.class, "Format_OperatingSystem_Value",
+        return NbBundle.getMessage(AboutWindowPanel.class, "Format_OperatingSystem_Value",
                                    System.getProperty("os.name",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("os.version",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("os.arch",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")));
     }
 
     private static String getJavaValue() {
         return System.getProperty("java.version",
-                                  NbBundle.getMessage(ProductInformationPanel.class,
+                                  NbBundle.getMessage(AboutWindowPanel.class,
                                                       "ProductInformationPanel.propertyUnknown.text"));
     }
 
     private static String getVMValue() {
-        return NbBundle.getMessage(ProductInformationPanel.class,
+        return NbBundle.getMessage(AboutWindowPanel.class,
                                    "ProductInformationPanel.getVMValue.text",
                                    System.getProperty("java.vm.name",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("java.vm.version", ""));
     }
@@ -264,7 +262,7 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
 
     private static String getEncodingValue() {
         return System.getProperty("file.encoding",
-                                  NbBundle.getMessage(ProductInformationPanel.class, "ProductInformationPanel.propertyUnknown.text"));
+                                  NbBundle.getMessage(AboutWindowPanel.class, "ProductInformationPanel.propertyUnknown.text"));
     }
     
     public void setCopyright(String text) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index ac3e321cea..22b9f22476 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -1,8 +1,8 @@
 CTL_DataContentAction=DataContent
 CTL_DataContentTopComponent=Data Content
 CTL_CustomAboutAction=About
-OptionsCategory_Name_General=Display
-OptionsCategory_Keywords_General=display
+OptionsCategory_Name_General=Autopsy
+OptionsCategory_Keywords_General=Autopsy Options
 HINT_DataContentTopComponent=This is a DataContent window
 HINT_NodeTableTopComponent=This is a DataResult window
 OpenIDE-Module-Name=CoreComponents
@@ -147,3 +147,4 @@ DataResultViewerThumbnail.switchPage.done.errMsg=Error making thumbnails\: {0}
 FXVideoPanel.pauseButton.infoLabel.playbackErr=Playback error.
 GstVideoPanel.progress.infoLabel.updateErr=Error updating video progress\: {0}
 GstVideoPanel.ExtractMedia.progress.buffering=Buffering {0}
+GeneralPanel.jLabel4.text=Number of threads to use for file ingest:
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
index 2486554c22..084300be67 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * Interface used to capture frames from a video file.
  */
- interface FrameCapture {
+ public interface FrameCapture {
     
     /**
      * @param file the video file to use
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
index 127fd1c0da..9d0b592546 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
@@ -30,7 +30,7 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 @OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_General",
-        iconBase = "org/sleuthkit/autopsy/corecomponents/display-options.png",
+        iconBase = "org/sleuthkit/autopsy/corecomponents/checkbox.png",
         position = 1,
         keywords = "#OptionsCategory_Keywords_General",
         keywordsCategory = "General")
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
index 432bd9b5c3..ea8c8fed21 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.form
@@ -42,6 +42,7 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                           <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Group type="102" attributes="0">
                               <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
@@ -49,10 +50,11 @@
                                   <Component id="useBestViewerRB" min="-2" max="-2" attributes="0"/>
                                   <Component id="dataSourcesHideKnownCB" alignment="0" min="-2" max="-2" attributes="0"/>
                                   <Component id="viewsHideKnownCB" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="numberOfFileIngestThreadsComboBox" min="-2" max="-2" attributes="0"/>
                               </Group>
                           </Group>
                       </Group>
-                      <EmptySpace min="0" pref="13" max="32767" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
               </Group>
           </Group>
@@ -78,7 +80,10 @@
               <Component id="useLocalTimeRB" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="useGMTTimeRB" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="30" max="32767" attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="numberOfFileIngestThreadsComboBox" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -173,5 +178,25 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="jLabel4">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="GeneralPanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JComboBox" name="numberOfFileIngestThreadsComboBox">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="4">
+            <StringItem index="0" value="1"/>
+            <StringItem index="1" value="2"/>
+            <StringItem index="2" value="3"/>
+            <StringItem index="3" value="4"/>
+          </StringArray>
+        </Property>
+        <Property name="selectedIndex" type="int" value="1"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
index 3d697b07ab..7016287017 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralPanel.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +21,10 @@ package org.sleuthkit.autopsy.corecomponents;
 import java.util.prefs.Preferences;
 import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import org.sleuthkit.autopsy.ingest.IngestManager;
 
 final class GeneralPanel extends javax.swing.JPanel {
 
-    private final GeneralOptionsPanelController controller;
     private static final String KEEP_PREFERRED_VIEWER = "keepPreferredViewer";
     private static final String USE_LOCAL_TIME = "useLocalTime";
     private static final String DS_HIDE_KNOWN = "dataSourcesHideKnown"; // Default false
@@ -32,7 +32,6 @@ final class GeneralPanel extends javax.swing.JPanel {
     private final Preferences prefs = NbPreferences.forModule(this.getClass());
 
     GeneralPanel(GeneralOptionsPanelController controller) {
-        this.controller = controller;
         initComponents();
         ContentUtils.setDisplayInLocalTime(useLocalTimeRB.isSelected());
         // TODO listen to changes in form fields and call controller.changed()
@@ -57,6 +56,8 @@ final class GeneralPanel extends javax.swing.JPanel {
         jLabel3 = new javax.swing.JLabel();
         dataSourcesHideKnownCB = new javax.swing.JCheckBox();
         viewsHideKnownCB = new javax.swing.JCheckBox();
+        jLabel4 = new javax.swing.JLabel();
+        numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox();
 
         buttonGroup1.add(useBestViewerRB);
         useBestViewerRB.setSelected(true);
@@ -94,6 +95,11 @@ final class GeneralPanel extends javax.swing.JPanel {
 
         org.openide.awt.Mnemonics.setLocalizedText(viewsHideKnownCB, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.viewsHideKnownCB.text")); // NOI18N
 
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(GeneralPanel.class, "GeneralPanel.jLabel4.text")); // NOI18N
+
+        numberOfFileIngestThreadsComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "2", "3", "4" }));
+        numberOfFileIngestThreadsComboBox.setSelectedIndex(1);
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -114,14 +120,16 @@ final class GeneralPanel extends javax.swing.JPanel {
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(jLabel1)
                             .addComponent(jLabel3)
+                            .addComponent(jLabel4)
                             .addGroup(layout.createSequentialGroup()
                                 .addGap(10, 10, 10)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addComponent(keepCurrentViewerRB)
                                     .addComponent(useBestViewerRB)
                                     .addComponent(dataSourcesHideKnownCB)
-                                    .addComponent(viewsHideKnownCB))))
-                        .addGap(0, 13, Short.MAX_VALUE))))
+                                    .addComponent(viewsHideKnownCB)
+                                    .addComponent(numberOfFileIngestThreadsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                        .addGap(0, 0, Short.MAX_VALUE))))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -143,7 +151,10 @@ final class GeneralPanel extends javax.swing.JPanel {
                 .addComponent(useLocalTimeRB)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(useGMTTimeRB)
-                .addContainerGap(30, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(jLabel4)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(numberOfFileIngestThreadsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -164,6 +175,7 @@ final class GeneralPanel extends javax.swing.JPanel {
         useGMTTimeRB.setSelected(!useLocalTime);
         dataSourcesHideKnownCB.setSelected(prefs.getBoolean(DS_HIDE_KNOWN, false));
         viewsHideKnownCB.setSelected(prefs.getBoolean(VIEWS_HIDE_KNOWN, true));
+        numberOfFileIngestThreadsComboBox.setSelectedItem(IngestManager.getInstance().getNumberOfFileIngestThreads());
     }
 
     void store() {
@@ -171,6 +183,7 @@ final class GeneralPanel extends javax.swing.JPanel {
         prefs.putBoolean(USE_LOCAL_TIME, useLocalTimeRB.isSelected());
         prefs.putBoolean(DS_HIDE_KNOWN, dataSourcesHideKnownCB.isSelected());
         prefs.putBoolean(VIEWS_HIDE_KNOWN, viewsHideKnownCB.isSelected());
+        IngestManager.getInstance().setNumberOfFileIngestThreads(Integer.valueOf(numberOfFileIngestThreadsComboBox.getSelectedItem().toString()));
     }
 
     boolean valid() {
@@ -184,7 +197,9 @@ final class GeneralPanel extends javax.swing.JPanel {
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel4;
     private javax.swing.JRadioButton keepCurrentViewerRB;
+    private javax.swing.JComboBox numberOfFileIngestThreadsComboBox;
     private javax.swing.JRadioButton useBestViewerRB;
     private javax.swing.JRadioButton useGMTTimeRB;
     private javax.swing.JRadioButton useLocalTimeRB;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java
index ce4080fb2c..95ce2c6d29 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/VideoFrame.java
@@ -5,7 +5,7 @@ import java.awt.Image;
 /**
  *
  */
- class VideoFrame {
+public class VideoFrame {
 
     private Image frame;
     private long timeMillis;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox.png b/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox.png
new file mode 100755
index 0000000000..410a9ab1c4
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
index 820eb6b25d..e6122bd893 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
@@ -90,7 +90,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         outputStringRedirect = null;
 
         //gc process with its streams
-        proc = null;
+        //proc = null;
 
         return output;
     }
@@ -137,7 +137,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         logger.log(Level.INFO, aCommand + " exit value: " + exitVal);
 
         //gc process with its streams
-        proc = null;
+        //proc = null;
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
index d32234fa92..d3258e5885 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
@@ -208,11 +208,11 @@ public class PlatformUtil {
      * @throws IOException exception thrown if extract the file failed for IO
      * reasons
      */
-    public static <T> boolean extractResourceToUserConfigDir(final Class<T> resourceClass, final String resourceFile) throws IOException {
+    public static <T> boolean extractResourceToUserConfigDir(final Class<T> resourceClass, final String resourceFile, boolean overWrite) throws IOException {
         final File userDir = new File(getUserConfigDirectory());
 
         final File resourceFileF = new File(userDir + File.separator + resourceFile);
-        if (resourceFileF.exists()) {
+        if (resourceFileF.exists() && !overWrite) {
             return false;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
index 2a19075913..ed401bc5c3 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
@@ -70,7 +70,7 @@ public class XMLUtil {
      */
     public static <T> boolean xmlIsValid(DOMSource xmlfile, Class<T> clazz, String schemaFile) {
       try{
-        PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile);
+        PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile, false);
         File schemaLoc = new File(PlatformUtil.getUserConfigDirectory() + File.separator + schemaFile);
         SchemaFactory schm = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         try{
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index d5e82204b2..53242a04b3 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -73,6 +73,7 @@ import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskException;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+
 /**
  * Top component which displays something.
  */
@@ -82,7 +83,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     private transient ExplorerManager em = new ExplorerManager();
     private static DirectoryTreeTopComponent instance;
     private DataResultTopComponent dataResult = new DataResultTopComponent(true, NbBundle.getMessage(this.getClass(),
-                                                                                                     "DirectoryTreeTopComponent.title.text"));
+            "DirectoryTreeTopComponent.title.text"));
     private LinkedList<String[]> backList;
     private LinkedList<String[]> forwardList;
     /**
@@ -222,12 +223,12 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     private void backButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backButtonActionPerformed
         // change the cursor to "waiting cursor" for this operation
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        
+
         // the end is the current place,
         String[] currentNodePath = backList.pollLast();
         forwardList.addLast(currentNodePath);
         forwardButton.setEnabled(true);
-        
+
         /* We peek instead of poll because we use its existence
          * in the list later on so that we do not reset the forward list
          * after the selection occurs. */
@@ -239,7 +240,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         } else {
             backButton.setEnabled(false);
         }
-        
+
         // update the selection on directory tree
         setSelectedNode(newCurrentNodePath, null);
 
@@ -256,10 +257,10 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         } else {
             forwardButton.setEnabled(false);
         }
-        
+
         backList.addLast(newCurrentNodePath);
         backButton.setEnabled(true);
- 
+
         // update the selection on directory tree
         setSelectedNode(newCurrentNodePath, null);
 
@@ -543,8 +544,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                 // The current case has been closed. Reset the ExplorerManager.
                 Node emptyNode = new AbstractNode(Children.LEAF);
                 em.setRootContext(emptyNode);
-            }
-            else if (newValue != null) {
+            } else if (newValue != null) {
                 // A new case has been opened. Reset the forward and back 
                 // buttons. Note that a call to CoreComponentControl.openCoreWindows()
                 // by the new Case object will lead to a componentOpened() call
@@ -598,7 +598,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                     refreshTree(event.getArtifactType());
                 }
             });
-        } else if (changed.equals(IngestEvent.COMPLETED.toString())) {
+        } else if (changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString())
+                || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) {
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
@@ -654,7 +655,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                             return;
                         }
                         Node originNode = origin.getNode();
-                        
+
                         //set node, wrap in filter node first to filter out children
                         Node drfn = new DataResultFilterNode(originNode, DirectoryTreeTopComponent.this.em);
                         Node kffn = new KnownFileFilterNode(drfn, KnownFileFilterNode.getSelectionContext(originNode));
@@ -667,9 +668,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                                 displayName = content.getUniquePath();
                             } catch (TskCoreException ex) {
                                 logger.log(Level.SEVERE, "Exception while calling Content.getUniquePath() for node: " + originNode);
-                            }    
-                        } 
-                        else if (originNode.getLookup().lookup(String.class) != null) {
+                            }
+                        } else if (originNode.getLookup().lookup(String.class) != null) {
                             displayName = originNode.getLookup().lookup(String.class);
                         }
                         dataResult.setPath(displayName);
@@ -695,12 +695,12 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         // update the back and forward list
         updateHistory(em.getSelectedNodes());
     }
-   
+
     private void updateHistory(Node[] selectedNodes) {
         if (selectedNodes.length == 0) {
             return;
         }
-        
+
         Node selectedNode = selectedNodes[0];
         String selectedNodeName = selectedNode.getName();
 
@@ -729,7 +729,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             forwardButton.setEnabled(false); // disable the forward Button
         }
     }
-    
+
     /**
      * Resets the back and forward list, and also disable the back and forward
      * buttons.
@@ -752,8 +752,6 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         pcs.removePropertyChangeListener(listener);
     }
 
-    
-
     /**
      * Gets the tree on this DirectoryTreeTopComponent.
      *
@@ -768,13 +766,13 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
      */
     public void refreshContentTreeSafe() {
         SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    refreshContentTree();
-                }
-            });
+            @Override
+            public void run() {
+                refreshContentTree();
+            }
+        });
     }
-    
+
     /**
      * Refreshes changed content nodes
      */
@@ -865,7 +863,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     /**
      * Set the selected node using a path to a previously selected node.
      *
-     * @param previouslySelectedNodePath Path to a previously selected node. 
+     * @param previouslySelectedNodePath Path to a previously selected node.
      * @param rootNodeName Name of the root node to match, may be null.
      */
     private void setSelectedNode(final String[] previouslySelectedNodePath, final String rootNodeName) {
@@ -876,28 +874,26 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             @Override
             public void run() {
                 if (previouslySelectedNodePath.length > 0 && (rootNodeName == null || previouslySelectedNodePath[0].equals(rootNodeName))) {
-                    Node selectedNode = null;                    
+                    Node selectedNode = null;
                     ArrayList<String> selectedNodePath = new ArrayList<>(Arrays.asList(previouslySelectedNodePath));
                     while (null == selectedNode && !selectedNodePath.isEmpty()) {
                         try {
-                            selectedNode = NodeOp.findPath(em.getRootContext(), selectedNodePath.toArray(new String[0]));                        
-                        }
-                        catch (NodeNotFoundException ex) {
+                            selectedNode = NodeOp.findPath(em.getRootContext(), selectedNodePath.toArray(new String[0]));
+                        } catch (NodeNotFoundException ex) {
                             // The selected node may have been deleted (e.g., a deleted tag), so truncate the path and try again. 
                             if (selectedNodePath.size() > 1) {
                                 selectedNodePath.remove(selectedNodePath.size() - 1);
-                            }                            
-                            else {
+                            } else {
                                 StringBuilder nodePath = new StringBuilder();
                                 for (int i = 0; i < previouslySelectedNodePath.length; ++i) {
                                     nodePath.append(previouslySelectedNodePath[i]).append("/");
                                 }
                                 logger.log(Level.WARNING, "Failed to find any nodes to select on path " + nodePath.toString(), ex);
-                                break; 
+                                break;
                             }
-                        } 
+                        }
                     }
-                    
+
                     if (null != selectedNode) {
                         if (rootNodeName != null) {
                             //called from tree auto refresh context
@@ -905,9 +901,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                             backList.pollLast();
                         }
                         try {
-                            em.setExploredContextAndSelection(selectedNode, new Node[]{selectedNode});                                                    
-                        }
-                        catch (PropertyVetoException ex) {
+                            em.setExploredContextAndSelection(selectedNode, new Node[]{selectedNode});
+                        } catch (PropertyVetoException ex) {
                             logger.log(Level.WARNING, "Property veto from ExplorerManager setting selection to " + selectedNode.getName(), ex);
                         }
                     }
@@ -970,11 +965,11 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             } catch (TskException ex) {
                 logger.log(Level.WARNING, "Error retrieving attributes", ex);
             }
-        } else if ( type.equals(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT) || 
-                    type.equals(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT) )   { 
+        } else if (type.equals(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)
+                || type.equals(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT)) {
             Node interestingItemsRootNode = resultsChilds.findChild(type.getLabel());
             Children interestingItemsRootChildren = interestingItemsRootNode.getChildren();
-             try {
+            try {
                 String setName = null;
                 List<BlackboardAttribute> attributes = art.getAttributes();
                 for (BlackboardAttribute att : attributes) {
@@ -1030,16 +1025,15 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     }
 
     void fireViewerComplete() {
-        
+
         try {
             firePropertyChange(BlackboardResultViewer.FINISHED_DISPLAY_EVT, 0, 1);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             logger.log(Level.SEVERE, "DirectoryTreeTopComponent listener threw exception", e);
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.moduleErr"),
-                                          NbBundle.getMessage(this.getClass(),
-                                                              "DirectoryTreeTopComponent.moduleErr.msg"),
-                                          MessageNotifyUtil.MessageType.ERROR);
+                    NbBundle.getMessage(this.getClass(),
+                    "DirectoryTreeTopComponent.moduleErr.msg"),
+                    MessageNotifyUtil.MessageType.ERROR);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
index a4497b5259..79dc70ce11 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
@@ -35,7 +35,7 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.casemodule.services.Services;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestModule;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
@@ -46,80 +46,42 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
+import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
 import org.sleuthkit.autopsy.ingest.IngestServices;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.datamodel.TskData;
 
 /**
  * Sample data source ingest module that doesn't do much. Demonstrates per
  * ingest job module settings, use of a subset of the available ingest services
- * and thread-safe sharing of per ingest job resources.
- * <p>
- * IMPORTANT TIP: This sample data source ingest module directly implements
- * DataSourceIngestModule, which extends IngestModule. A practical alternative,
- * recommended if you do not need to provide implementations of all of the
- * IngestModule methods, is to extend the abstract class IngestModuleAdapter to
- * get default "do nothing" implementations of the IngestModule methods.
+ * and thread-safe sharing of per ingest job data.
  */
-class SampleDataSourceIngestModule implements DataSourceIngestModule {
+class SampleDataSourceIngestModule extends IngestModuleAdapter implements DataSourceIngestModule {
 
-    private static final HashMap<Long, Integer> moduleReferenceCountsForIngestJobs = new HashMap<>();
     private static final HashMap<Long, Long> fileCountsForIngestJobs = new HashMap<>();
-    private static long messageCount = 0;
     private final boolean skipKnownFiles;
     private IngestJobContext context = null;
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
 
     SampleDataSourceIngestModule(SampleModuleIngestJobSettings settings) {
         this.skipKnownFiles = settings.skipKnownFiles();
     }
     
-    /**
-     * Invoked by Autopsy to allow an ingest module instance to set up any
-     * internal data structures and acquire any private resources it will need
-     * during an ingest job.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
-     *
-     * @param context Provides data and services specific to the ingest job and
-     * the ingest pipeline of which the module is a part.
-     * @throws org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException
-     */
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
 
-        // This method is thread-safe with per ingest job reference counting.
+        // This method is thread-safe with per ingest job reference counted
+        // management of shared data.
         initFileCount(context.getJobId());
     }
 
-    /**
-     * Processes a data source.
-     *
-     * @param dataSource The data source to process.
-     * @param statusHelper A status helper to be used to report progress and
-     * detect ingest job cancellation.
-     * @return A result code indicating success or failure of the processing.
-     */
     @Override
-    public ProcessResult process(Content dataSource, DataSourceIngestModuleStatusHelper statusHelper) {
+    public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress progressBar) {
+        // There are two tasks to do. Set the the progress bar to determinate 
+        // and set the remaining number of work units to be completed to two.
+        progressBar.switchToDeterminate(2);
+        
         Case autopsyCase = Case.getCurrentCase();
         SleuthkitCase sleuthkitCase = autopsyCase.getSleuthkitCase();
         Services services = new Services(sleuthkitCase);
@@ -134,6 +96,8 @@ class SampleDataSourceIngestModule implements DataSourceIngestModule {
                 }                
             }
             
+            progressBar.progress(1);
+            
             // Get files by creation time.
             long currentTime = System.currentTimeMillis() / 1000;
             long minTime = currentTime - (14 * 24 * 60 * 60); // Go back two weeks.
@@ -144,62 +108,33 @@ class SampleDataSourceIngestModule implements DataSourceIngestModule {
                 }                
             }
             
-            // This method is thread-safe and keeps per ingest job counters.
+            // This method is thread-safe with per ingest job reference counted
+            // management of shared data.
             addToFileCount(context.getJobId(), fileCount);
-
+            
+            progressBar.progress(1);
+            return IngestModule.ProcessResult.OK;         
+            
         } catch (TskCoreException ex) {
             IngestServices ingestServices = IngestServices.getInstance();
             Logger logger = ingestServices.getLogger(SampleIngestModuleFactory.getModuleName());
             logger.log(Level.SEVERE, "File query failed", ex);
             return IngestModule.ProcessResult.ERROR;
         }
-
-        return IngestModule.ProcessResult.OK;
     }
 
-    /**
-     * Invoked by Autopsy when an ingest job is completed, before the ingest
-     * module instance is discarded. The module should respond by doing things
-     * like releasing private resources, submitting final results, and posting a
-     * final ingest message.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
-     */
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        // This method is thread-safe with per ingest job reference counting.
+        // This method is thread-safe with per ingest job reference counted
+        // management of shared data.
         postFileCount(context.getJobId());
     }
 
     synchronized static void initFileCount(long ingestJobId) {
-        Integer moduleReferenceCount;
-        if (!moduleReferenceCountsForIngestJobs.containsKey(ingestJobId)) {
-            moduleReferenceCount = 1;
+        Long refCount = refCounter.incrementAndGet(ingestJobId);
+        if (refCount == 1) {
             fileCountsForIngestJobs.put(ingestJobId, 0L);
-        } else {
-            moduleReferenceCount = moduleReferenceCountsForIngestJobs.get(ingestJobId);
-            ++moduleReferenceCount;
         }
-        moduleReferenceCountsForIngestJobs.put(ingestJobId, moduleReferenceCount);
     }
 
     synchronized static void addToFileCount(long ingestJobId, long countToAdd) {
@@ -209,19 +144,16 @@ class SampleDataSourceIngestModule implements DataSourceIngestModule {
     }
 
     synchronized static void postFileCount(long ingestJobId) {
-        Integer moduleReferenceCount = moduleReferenceCountsForIngestJobs.remove(ingestJobId);
-        --moduleReferenceCount;
-        if (moduleReferenceCount == 0) {
+        Long refCount = refCounter.decrementAndGet(ingestJobId);
+        if (refCount == 0) {
             Long filesCount = fileCountsForIngestJobs.remove(ingestJobId);
             String msgText = String.format("Found %d files", filesCount);
             IngestMessage message = IngestMessage.createMessage(
-                    ++messageCount,
                     IngestMessage.MessageType.DATA,
                     SampleIngestModuleFactory.getModuleName(),
                     msgText);
             IngestServices.getInstance().postMessage(message);
-        } else {
-            moduleReferenceCountsForIngestJobs.put(ingestJobId, moduleReferenceCount);
-        }
+        } 
     }
+    
 }
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
index f967a6af7b..988d834904 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
@@ -37,8 +37,10 @@ import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestModule;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
+import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
@@ -50,57 +52,20 @@ import org.sleuthkit.datamodel.TskData;
 /**
  * Sample file ingest module that doesn't do much. Demonstrates per ingest job
  * module settings, use of a subset of the available ingest services and
- * thread-safe sharing of per ingest job resources.
- * <p>
- * IMPORTANT TIP: This sample data source ingest module directly implements
- * FileIngestModule, which extends IngestModule. A practical alternative,
- * recommended if you do not need to provide implementations of all of the
- * IngestModule methods, is to extend the abstract class IngestModuleAdapter to
- * get default "do nothing" implementations of the IngestModule methods.
+ * thread-safe sharing of per ingest job data.
  */
-class SampleFileIngestModule implements FileIngestModule {
+class SampleFileIngestModule extends IngestModuleAdapter implements FileIngestModule {
 
-    private static final HashMap<Long, Integer> moduleReferenceCountsForIngestJobs = new HashMap<>();
     private static final HashMap<Long, Long> artifactCountsForIngestJobs = new HashMap<>();
-    private static long messageCount = 0;
     private static int attrId = -1;
     private final boolean skipKnownFiles;
     private IngestJobContext context = null;
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
 
     SampleFileIngestModule(SampleModuleIngestJobSettings settings) {
         this.skipKnownFiles = settings.skipKnownFiles();
     }
 
-    /**
-     * Invoked by Autopsy to allow an ingest module instance to set up any
-     * internal data structures and acquire any private resources it will need
-     * during an ingest job.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
-     *
-     * @param context Provides data and services specific to the ingest job and
-     * the ingest pipeline of which the module is a part.
-     * @throws org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException
-     */
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
@@ -133,16 +98,11 @@ class SampleFileIngestModule implements FileIngestModule {
             }
         }
 
-        // This method is thread-safe with per ingest job reference counting.        
+        // This method is thread-safe with per ingest job reference counted
+        // management of shared data.
         initBlackboardPostCount(context.getJobId());
     }
 
-    /**
-     * Processes a file.
-     *
-     * @param file The file.
-     * @return A result code indicating success or failure of the processing.
-     */
     @Override
     public IngestModule.ProcessResult process(AbstractFile file) {
         if (attrId != -1) {
@@ -183,7 +143,8 @@ class SampleFileIngestModule implements FileIngestModule {
             BlackboardArtifact art = file.getGenInfoArtifact();
             art.addAttribute(attr);
 
-            // Thread-safe.
+            // This method is thread-safe with per ingest job reference counted
+            // management of shared data.
             addToBlackboardPostCount(context.getJobId(), 1L);
 
             // Fire an event to notify any listeners for blackboard postings.
@@ -200,49 +161,18 @@ class SampleFileIngestModule implements FileIngestModule {
         }
     }
 
-    /**
-     * Invoked by Autopsy when an ingest job is completed, before the ingest
-     * module instance is discarded. The module should respond by doing things
-     * like releasing private resources, submitting final results, and posting a
-     * final ingest message.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
-     */
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        // This method is thread-safe with per ingest job reference counting.
+        // This method is thread-safe with per ingest job reference counted
+        // management of shared data.
         reportBlackboardPostCount(context.getJobId());
     }
 
     synchronized static void initBlackboardPostCount(long ingestJobId) {
-        Integer moduleReferenceCount;
-        if (!moduleReferenceCountsForIngestJobs.containsKey(ingestJobId)) {
-            moduleReferenceCount = 1;
+        Long refCount = refCounter.incrementAndGet(ingestJobId);
+        if (refCount == 1) {
             artifactCountsForIngestJobs.put(ingestJobId, 0L);
-        } else {
-            moduleReferenceCount = moduleReferenceCountsForIngestJobs.get(ingestJobId);
-            ++moduleReferenceCount;
         }
-        moduleReferenceCountsForIngestJobs.put(ingestJobId, moduleReferenceCount);
     }
 
     synchronized static void addToBlackboardPostCount(long ingestJobId, long countToAdd) {
@@ -252,19 +182,15 @@ class SampleFileIngestModule implements FileIngestModule {
     }
 
     synchronized static void reportBlackboardPostCount(long ingestJobId) {
-        Integer moduleReferenceCount = moduleReferenceCountsForIngestJobs.remove(ingestJobId);
-        --moduleReferenceCount;
-        if (moduleReferenceCount == 0) {
+        Long refCount = refCounter.decrementAndGet(ingestJobId);
+        if (refCount == 0) {
             Long filesCount = artifactCountsForIngestJobs.remove(ingestJobId);
             String msgText = String.format("Posted %d times to the blackboard", filesCount);
             IngestMessage message = IngestMessage.createMessage(
-                    ++messageCount,
                     IngestMessage.MessageType.INFO,
                     SampleIngestModuleFactory.getModuleName(),
                     msgText);
             IngestServices.getInstance().postMessage(message);
-        } else {
-            moduleReferenceCountsForIngestJobs.put(ingestJobId, moduleReferenceCount);
         }
-    }
+    }  
 }
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
index dfa22c4218..9e9fbba5fe 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
@@ -55,10 +55,10 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
  * create instances of a type of data source ingest module, a type of file
  * ingest module, or both.
  * <p>
- * Autopsy will generally use the factory to several instances of each type of
- * module for each ingest job it performs. Completing an ingest job entails
- * processing a single data source (e.g., a disk image) and all of the files
- * from the data source, including files extracted from archives and any
+ * Autopsy will generally use the factory to create several instances of each
+ * type of module for each ingest job it performs. Completing an ingest job
+ * entails processing a single data source (e.g., a disk image) and all of the
+ * files from the data source, including files extracted from archives and any
  * unallocated space (made to look like a series of files). The data source is
  * passed through one or more pipelines of data source ingest modules. The files
  * are passed through one or more pipelines of file ingest modules.
@@ -87,7 +87,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
  * extend the abstract class IngestModuleFactoryAdapter to get default
  * implementations of most of the IngestModuleFactory methods.
  */
-// @ServiceProvider(service = IngestModuleFactory.class)
+@ServiceProvider(service = IngestModuleFactory.class) // Sample is discarded at runtime 
 public class SampleIngestModuleFactory implements IngestModuleFactory {
 
     private static final String VERSION_NUMBER = "1.0.0";
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index cc95e5b986..0a088da4dd 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -16,9 +16,11 @@ IngestMessagePanel.totalMessagesNameLabel.text=Total:
 IngestMessagePanel.totalMessagesNameVal.text=-
 IngestMessagePanel.totalUniqueMessagesNameLabel.text=Unique:
 IngestMessagePanel.totalUniqueMessagesNameVal.text=-
+IngestJob.progress.dataSourceIngest.displayName=Data Source Ingest of {0}
+IngestJob.progress.fileIngest.displayName=File Ingest of {0}
+IngestJob.progress.cancelling={0} (Cancelling...)
 IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=Processes unallocated space, such as deleted files. Produces more complete results, but it may take longer to process on large images.
 IngestJobConfigurationPanel.processUnallocCheckbox.text=Process Unallocated Space
-IngestJobConfigurationPanel.advancedButton.text=Advanced
 IngestJob.toString.text=ScheduledTask'{'input\={0}, modules\={1}'}'
 IngestJobLauncher.modName.tbirdParser.text=Thunderbird Parser
 IngestJobLauncher.modName.mboxParser.text=MBox Parser
@@ -46,14 +48,8 @@ IngestManager.toHtmlStr.totalErrs.text=Total errors\: {0}
 IngestManager.toHtmlStr.module.text=Module
 IngestManager.toHtmlStr.time.text=Time
 IngestManager.toHtmlStr.errors.text=Errors
-IngestManager.FileTaskWorker.displayName=File Ingest
-IngestManager.FileTaskWorker.process.cancelling={0} (Cancelling...)
 IngestManager.EnqueueWorker.displayName.text=Queueing Ingest
 IngestManager.EnqueueWorker.process.cancelling={0} (Cancelling...)
-IngestManager.DataSourceTaskWorker.progress.pending={0} (Pending...)
-IngestManager.DataSourceTaskWorker.progress.cancelling={0} (Cancelling...)
-IngestManager.datatSourceIngest.progress.text=DataSource Ingest {0}
-IngestManager.fileIngest.progress.text=File Ingest {0}
 IngestJob.DataSourceIngestPipeline.displayName.text={0} processing {1}
 IngestMessage.toString.type.text=type\: {0}
 IngestMessage.toString.source.text=\ source\: {0}
@@ -101,3 +97,6 @@ IngestScheduler.remove.exception.notSupported.msg=Not supported.
 IngestScheduler.DataSourceScheduler.exception.next.msg=There is no data source tasks in the queue, check hasNext()
 IngestScheduler.DataSourceScheduler.exception.remove.msg=Removing of scheduled data source ingest tasks is not supported.
 IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, size\: {0}
+Label1
+IngestJobConfigurationPanel.advancedButton.text=Advanced
+IngestJobConfigurationPanel.advancedButton.actionCommand=Advanced
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModule.java
index 5975990b5d..b94c037e08 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModule.java
@@ -22,16 +22,18 @@ import org.sleuthkit.datamodel.Content;
 
 /**
  * Interface that must be implemented by all data source ingest modules.
+ * See description of IngestModule for more details on interface behavior.
  */
 public interface DataSourceIngestModule extends IngestModule {
 
     /**
-     * Processes a data source.
+     * Processes a data source. Called once between calls to startUp()
+     * and shutDown().
      *
      * @param dataSource The data source to process.
      * @param statusHelper A status helper to be used to report progress and
      * detect ingest job cancellation.
      * @return A result code indicating success or failure of the processing.
      */
-    ProcessResult process(Content dataSource, DataSourceIngestModuleStatusHelper statusHelper);
+    ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper);
 }
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleStatusHelper.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
similarity index 55%
rename from Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleStatusHelper.java
rename to Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
index 87b670bb1a..39fbca98fe 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleStatusHelper.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModuleProgress.java
@@ -18,35 +18,17 @@
  */
 package org.sleuthkit.autopsy.ingest;
 
-import javax.swing.SwingWorker;
-import org.netbeans.api.progress.ProgressHandle;
-import org.sleuthkit.datamodel.Content;
-
 /**
- * Used by data source ingest modules to report progress and detect data source
- * ingest job cancellation.
+ * Used by data source ingest modules to report progress.
  */
-public class DataSourceIngestModuleStatusHelper {
+public class DataSourceIngestModuleProgress {
 
-    private final SwingWorker worker;
-    private final ProgressHandle progress;
-    private final Content dataSource;
+    private final IngestJob ingestJob;
+    private final String moduleDisplayName;
 
-    DataSourceIngestModuleStatusHelper(SwingWorker worker, ProgressHandle progress, Content dataSource) {
-        this.worker = worker;
-        this.progress = progress;
-        this.dataSource = dataSource;
-    }
-
-    /**
-     * Checks for ingest job cancellation. This should be polled by the module
-     * in its process() method. If the ingest task is canceled, the module
-     * should return from its process() method as quickly as possible.
-     *
-     * @return True if the task has been canceled, false otherwise.
-     */
-    public boolean isIngestJobCancelled() {
-        return worker.isCancelled();
+    DataSourceIngestModuleProgress(IngestJob ingestJob, String moduleDisplayName) {
+        this.ingestJob = ingestJob;
+        this.moduleDisplayName = moduleDisplayName;
     }
 
     /**
@@ -58,9 +40,7 @@ public class DataSourceIngestModuleStatusHelper {
      * data source.
      */
     public void switchToDeterminate(int workUnits) {
-        if (progress != null) {
-            progress.switchToDeterminate(workUnits);
-        }
+        ingestJob.getDataSourceTaskProgressBar().switchToDeterminate(workUnits);
     }
 
     /**
@@ -68,9 +48,7 @@ public class DataSourceIngestModuleStatusHelper {
      * the total work units to process the data source is unknown.
      */
     public void switchToIndeterminate() {
-        if (progress != null) {
-            progress.switchToIndeterminate();
-        }
+        ingestJob.getDataSourceTaskProgressBar().switchToIndeterminate();
     }
 
     /**
@@ -80,8 +58,6 @@ public class DataSourceIngestModuleStatusHelper {
      * @param workUnits Number of work units performed so far by the module.
      */
     public void progress(int workUnits) {
-        if (progress != null) {
-            progress.progress(dataSource.getName(), workUnits);
-        }
+        ingestJob.getDataSourceTaskProgressBar().progress(this.moduleDisplayName, workUnits);
     }
 }
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
new file mode 100755
index 0000000000..fb349f249c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
@@ -0,0 +1,138 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.sleuthkit.datamodel.Content;
+
+/**
+ * A data source ingest pipeline composed of a sequence of data source ingest
+ * modules constructed from ingest module templates.
+ */
+final class DataSourceIngestPipeline {
+
+    private final IngestJob job;
+    private final List<IngestModuleTemplate> moduleTemplates;
+    private List<DataSourceIngestModuleDecorator> modules = new ArrayList<>();
+
+    DataSourceIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
+        this.job = task;
+        this.moduleTemplates = moduleTemplates;
+    }
+
+    List<IngestModuleError> startUp() {
+        List<IngestModuleError> errors = new ArrayList<>();
+        // Create an ingest module instance from each ingest module template
+        // that has an ingest module factory capable of making data source
+        // ingest modules. Map the module class names to the module instance
+        // to allow the modules to be put in the sequence indicated by the
+        // ingest pipelines configuration.
+        Map<String, DataSourceIngestModuleDecorator> modulesByClass = new HashMap<>();
+        for (IngestModuleTemplate template : moduleTemplates) {
+            if (template.isDataSourceIngestModuleTemplate()) {
+                DataSourceIngestModuleDecorator module = new DataSourceIngestModuleDecorator(template.createDataSourceIngestModule(), template.getModuleName());
+                IngestJobContext context = new IngestJobContext(job);
+                try {
+                    module.startUp(context);
+                    modulesByClass.put(module.getClassName(), module);
+                } catch (Exception ex) {
+                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
+                }
+            }
+        }
+        // Establish the module sequence of the core ingest modules
+        // indicated by the ingest pipeline configuration, adding any
+        // additional modules found in the global lookup to the end of the
+        // pipeline in arbitrary order.
+        List<String> pipelineConfig = IngestPipelinesConfiguration.getInstance().getDataSourceIngestPipelineConfig();
+        for (String moduleClassName : pipelineConfig) {
+            if (modulesByClass.containsKey(moduleClassName)) {
+                modules.add(modulesByClass.remove(moduleClassName));
+            }
+        }
+        for (DataSourceIngestModuleDecorator module : modulesByClass.values()) {
+            modules.add(module);
+        }
+        return errors;
+    }
+
+    List<IngestModuleError> process() {
+        List<IngestModuleError> errors = new ArrayList<>();
+        for (DataSourceIngestModuleDecorator module : this.modules) {
+            try {
+                module.process(job.getDataSource(), new DataSourceIngestModuleProgress(job, module.getDisplayName()));
+            } catch (Exception ex) {
+                errors.add(new IngestModuleError(module.getDisplayName(), ex));
+            }
+            if (job.isCancelled()) {
+                break;
+            }
+        }
+        return errors;
+    }
+
+    List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
+        List<IngestModuleError> errors = new ArrayList<>();
+        for (DataSourceIngestModuleDecorator module : this.modules) {
+            try {
+                module.shutDown(ingestJobCancelled);
+            } catch (Exception ex) {
+                errors.add(new IngestModuleError(module.getDisplayName(), ex));
+            }
+        }
+        return errors;
+    }
+
+    private static class DataSourceIngestModuleDecorator implements DataSourceIngestModule {
+
+        private final DataSourceIngestModule module;
+        private final String displayName;
+
+        DataSourceIngestModuleDecorator(DataSourceIngestModule module, String displayName) {
+            this.module = module;
+            this.displayName = displayName;
+        }
+
+        String getClassName() {
+            return module.getClass().getCanonicalName();
+        }
+
+        String getDisplayName() {
+            return displayName;
+        }
+
+        @Override
+        public void startUp(IngestJobContext context) throws IngestModuleException {
+            module.startUp(context);
+        }
+
+        @Override
+        public IngestModule.ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) {
+            return module.process(dataSource, statusHelper);
+        }
+
+        @Override
+        public void shutDown(boolean ingestJobWasCancelled) {
+            module.shutDown(ingestJobWasCancelled);
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestModule.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestModule.java
index b212820424..cb94a7c797 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestModule.java
@@ -22,13 +22,15 @@ import org.sleuthkit.datamodel.AbstractFile;
 
 /**
  * Interface that must be implemented by all file ingest modules. 
+ * See description of IngestModule for more details on interface behavior.
  */
 public interface FileIngestModule extends IngestModule {
 
     /**
-     * Processes a file.
+     * Processes a file. Called between calls to startUp() and shutDown().
+     * Will be called for each file in a data source.
      *
-     * @param file The file.
+     * @param file The file to analyze.
      * @return A result code indicating success or failure of the processing.
      */
     ProcessResult process(AbstractFile file);
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
new file mode 100755
index 0000000000..2cd7d838e4
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
@@ -0,0 +1,142 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.sleuthkit.datamodel.AbstractFile;
+
+/**
+ * A file ingest pipeline composed of a sequence of file ingest modules
+ * constructed from ingest module templates.
+ */
+final class FileIngestPipeline {
+
+    private final IngestJob job;
+    private final List<IngestModuleTemplate> moduleTemplates;
+    private List<FileIngestModuleDecorator> modules = new ArrayList<>();
+
+    FileIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
+        this.job = task;
+        this.moduleTemplates = moduleTemplates;
+    }
+
+    List<IngestModuleError> startUp() {
+        List<IngestModuleError> errors = new ArrayList<>();
+        // Create an ingest module instance from each ingest module template
+        // that has an ingest module factory capable of making data source
+        // ingest modules. Map the module class names to the module instance
+        // to allow the modules to be put in the sequence indicated by the
+        // ingest pipelines configuration.
+        Map<String, FileIngestModuleDecorator> modulesByClass = new HashMap<>();
+        for (IngestModuleTemplate template : moduleTemplates) {
+            if (template.isFileIngestModuleTemplate()) {
+                FileIngestModuleDecorator module = new FileIngestModuleDecorator(template.createFileIngestModule(), template.getModuleName());
+                IngestJobContext context = new IngestJobContext(job);
+                try {
+                    module.startUp(context);
+                    modulesByClass.put(module.getClassName(), module);
+                } catch (Exception ex) {
+                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
+                }
+            }
+        }
+        // Establish the module sequence of the core ingest modules
+        // indicated by the ingest pipeline configuration, adding any
+        // additional modules found in the global lookup to the end of the
+        // pipeline in arbitrary order.
+        List<String> pipelineConfig = IngestPipelinesConfiguration.getInstance().getFileIngestPipelineConfig();
+        for (String moduleClassName : pipelineConfig) {
+            if (modulesByClass.containsKey(moduleClassName)) {
+                modules.add(modulesByClass.remove(moduleClassName));
+            }
+        }
+        for (FileIngestModuleDecorator module : modulesByClass.values()) {
+            modules.add(module);
+        }
+        return errors;
+    }
+
+    List<IngestModuleError> process(AbstractFile file) {
+        List<IngestModuleError> errors = new ArrayList<>();
+        for (FileIngestModuleDecorator module : this.modules) {
+            try {
+                module.process(file);
+            } catch (Exception ex) {
+                errors.add(new IngestModuleError(module.getDisplayName(), ex));
+            }
+            if (job.isCancelled()) {
+                break;
+            }
+        }
+        file.close();
+        if (!job.isCancelled()) {
+            IngestManager.fireFileIngestDone(file.getId());
+        }
+        return errors;
+    }
+
+    List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
+        List<IngestModuleError> errors = new ArrayList<>();
+        for (FileIngestModuleDecorator module : this.modules) {
+            try {
+                module.shutDown(ingestJobCancelled);
+            } catch (Exception ex) {
+                errors.add(new IngestModuleError(module.getDisplayName(), ex));
+            }
+        }
+        return errors;
+    }
+
+    private static class FileIngestModuleDecorator implements FileIngestModule {
+
+        private final FileIngestModule module;
+        private final String displayName;
+
+        FileIngestModuleDecorator(FileIngestModule module, String displayName) {
+            this.module = module;
+            this.displayName = displayName;
+        }
+
+        String getClassName() {
+            return module.getClass().getCanonicalName();
+        }
+
+        String getDisplayName() {
+            return displayName;
+        }
+
+        @Override
+        public void startUp(IngestJobContext context) throws IngestModuleException {
+            module.startUp(context);
+        }
+
+        @Override
+        public IngestModule.ProcessResult process(AbstractFile file) {
+            return module.process(file);
+        }
+
+        @Override
+        public void shutDown(boolean ingestJobWasCancelled) {
+            module.shutDown(ingestJobWasCancelled);
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
index f2d7ade02e..af5e9b8f3a 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJob.java
@@ -21,13 +21,10 @@ package org.sleuthkit.autopsy.ingest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressHandleFactory;
+import org.openide.util.Cancellable;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -42,9 +39,14 @@ final class IngestJob {
     private final boolean processUnallocatedSpace;
     private final HashMap<Long, FileIngestPipeline> fileIngestPipelines = new HashMap<>();
     private final HashMap<Long, DataSourceIngestPipeline> dataSourceIngestPipelines = new HashMap<>();
+    private final IngestScheduler.FileScheduler fileScheduler = IngestScheduler.getInstance().getFileScheduler();
     private FileIngestPipeline initialFileIngestPipeline = null;
     private DataSourceIngestPipeline initialDataSourceIngestPipeline = null;
-    private boolean cancelled;
+    private ProgressHandle dataSourceTaskProgress;
+    private ProgressHandle fileTasksProgress;
+    int totalEnqueuedFiles = 0;
+    private int processedFiles = 0;
+    private volatile boolean cancelled;
 
     IngestJob(long id, Content dataSource, List<IngestModuleTemplate> ingestModuleTemplates, boolean processUnallocatedSpace) {
         this.id = id;
@@ -66,15 +68,53 @@ final class IngestJob {
         return processUnallocatedSpace;
     }
 
-    synchronized void cancel() {
-        cancelled = true;
-    }
-
-    synchronized boolean isCancelled() {
-        return cancelled;
-    }
-
     synchronized List<IngestModuleError> startUpIngestPipelines() {
+        startDataSourceIngestProgressBar();
+        startFileIngestProgressBar();
+        return startUpInitialIngestPipelines();
+    }
+
+    private void startDataSourceIngestProgressBar() {
+        final String displayName = NbBundle
+                .getMessage(this.getClass(), "IngestJob.progress.dataSourceIngest.displayName", this.dataSource.getName());
+        dataSourceTaskProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
+            @Override
+            public boolean cancel() {
+                if (dataSourceTaskProgress != null) {
+                    dataSourceTaskProgress.setDisplayName(NbBundle.getMessage(this.getClass(),
+                            "IngestJob.progress.cancelling",
+                            displayName));
+                }
+                IngestManager.getInstance().cancelIngestJobs();
+                return true;
+            }
+        });
+        dataSourceTaskProgress.start();
+        dataSourceTaskProgress.switchToIndeterminate();
+    }
+
+    private void startFileIngestProgressBar() {
+        final String displayName = NbBundle
+                .getMessage(this.getClass(), "IngestJob.progress.fileIngest.displayName", this.dataSource.getName());
+        fileTasksProgress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
+            @Override
+            public boolean cancel() {
+                if (fileTasksProgress != null) {
+                    fileTasksProgress.setDisplayName(
+                            NbBundle.getMessage(this.getClass(), "IngestJob.progress.cancelling",
+                            displayName));
+                }
+                IngestManager.getInstance().cancelIngestJobs();
+                return true;
+            }
+        });
+        fileTasksProgress.start();
+        fileTasksProgress.switchToIndeterminate();
+        totalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
+        fileTasksProgress.switchToDeterminate(totalEnqueuedFiles);
+    }
+
+    private List<IngestModuleError> startUpInitialIngestPipelines() {
         // Create a per thread instance of each pipeline type right now to make 
         // (reasonably) sure that the ingest modules can be started.
         initialDataSourceIngestPipeline = new DataSourceIngestPipeline(this, ingestModuleTemplates);
@@ -119,271 +159,69 @@ final class IngestJob {
 
     synchronized List<IngestModuleError> releaseIngestPipelinesForThread(long threadId) {
         List<IngestModuleError> errors = new ArrayList<>();
-
+        
         DataSourceIngestPipeline dataSourceIngestPipeline = dataSourceIngestPipelines.get(threadId);
         if (dataSourceIngestPipeline != null) {
             errors.addAll(dataSourceIngestPipeline.shutDown(cancelled));
+            dataSourceIngestPipelines.remove(threadId);
+        }
+        if (initialDataSourceIngestPipeline == null && dataSourceIngestPipelines.isEmpty() && dataSourceTaskProgress != null) {
+            dataSourceTaskProgress.finish();
+            dataSourceTaskProgress = null;
         }
-        this.dataSourceIngestPipelines.remove(threadId);
 
         FileIngestPipeline fileIngestPipeline = fileIngestPipelines.get(threadId);
         if (fileIngestPipeline != null) {
             errors.addAll(fileIngestPipeline.shutDown(cancelled));
+            fileIngestPipelines.remove(threadId);
+        }
+        if (initialFileIngestPipeline == null && fileIngestPipelines.isEmpty() && fileTasksProgress != null) {
+            fileTasksProgress.finish();
+            fileTasksProgress = null;
         }
-        this.fileIngestPipelines.remove(threadId);
 
         return errors;
     }
 
     synchronized boolean areIngestPipelinesShutDown() {
-        return (dataSourceIngestPipelines.isEmpty() && fileIngestPipelines.isEmpty());
+        return (initialDataSourceIngestPipeline == null
+                && dataSourceIngestPipelines.isEmpty()
+                && initialFileIngestPipeline == null
+                && fileIngestPipelines.isEmpty());
     }
 
-    /**
-     * A data source ingest pipeline composed of a sequence of data source ingest
-     * modules constructed from ingest module templates.
-     */
-    static final class DataSourceIngestPipeline {
-
-        private static final Logger logger = Logger.getLogger(DataSourceIngestPipeline.class.getName());
-        private final IngestJob task;
-        private final List<IngestModuleTemplate> moduleTemplates;
-        private List<DataSourceIngestModuleDecorator> modules = new ArrayList<>();
-
-        private DataSourceIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
-            this.task = task;
-            this.moduleTemplates = moduleTemplates;
-        }
-
-        private List<IngestModuleError> startUp() {
-            List<IngestModuleError> errors = new ArrayList<>();
-
-            // Create an ingest module instance from each ingest module template 
-            // that has an ingest module factory capable of making data source 
-            // ingest modules. Map the module class names to the module instance 
-            // to allow the modules to be put in the sequence indicated by the
-            // ingest pipelines configuration.
-            Map<String, DataSourceIngestModuleDecorator> modulesByClass = new HashMap<>();
-            for (IngestModuleTemplate template : moduleTemplates) {
-                if (template.isDataSourceIngestModuleTemplate()) {
-                    DataSourceIngestModuleDecorator module = new DataSourceIngestModuleDecorator(template.createDataSourceIngestModule(), template.getModuleName());
-                    IngestJobContext context = new IngestJobContext(task);
-                    try {
-                        module.startUp(context);
-                        modulesByClass.put(module.getClassName(), module);
-                        IngestManager.fireModuleEvent(IngestManager.IngestEvent.STARTED.toString(), module.getDisplayName());
-                    } catch (Exception ex) {
-                        errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                    }
-                }
-            }
-
-            // Establish the module sequence of the core ingest modules 
-            // indicated by the ingest pipeline configuration, adding any 
-            // additional modules found in the global lookup to the end of the 
-            // pipeline in arbitrary order.
-            List<String> pipelineConfig = IngestPipelinesConfiguration.getInstance().getDataSourceIngestPipelineConfig();
-            for (String moduleClassName : pipelineConfig) {
-                if (modulesByClass.containsKey(moduleClassName)) {
-                    modules.add(modulesByClass.remove(moduleClassName));
-                }
-            }
-            for (DataSourceIngestModuleDecorator module : modulesByClass.values()) {
-                modules.add(module);
-            }
-
-            return errors;
-        }
-
-        List<IngestModuleError> process(SwingWorker worker, ProgressHandle progress) {
-            List<IngestModuleError> errors = new ArrayList<>();
-            Content dataSource = this.task.getDataSource();
-            logger.log(Level.INFO, "Processing data source {0}", dataSource.getName());
-            for (DataSourceIngestModuleDecorator module : this.modules) {
-                try {
-                    String displayName = NbBundle.getMessage(this.getClass(), "IngestJob.DataSourceIngestPipeline.displayName.text", module.getDisplayName(), dataSource.getName());
-                    progress.setDisplayName(displayName);
-                    module.process(dataSource, new DataSourceIngestModuleStatusHelper(worker, progress, dataSource));
-                } catch (Exception ex) {
-                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                }
-                if (task.isCancelled()) {
-                    break;
-                }
-            }
-            return errors;
-        }
-
-        private List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
-            List<IngestModuleError> errors = new ArrayList<>();
-            for (DataSourceIngestModuleDecorator module : this.modules) {
-                try {
-                    module.shutDown(ingestJobCancelled);
-                } catch (Exception ex) {
-                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                } finally {
-                    IngestManager.fireModuleEvent(IngestManager.IngestEvent.COMPLETED.toString(), module.getDisplayName());
-                }
-            }
-            return errors;
-        }
-
-        private static class DataSourceIngestModuleDecorator implements DataSourceIngestModule {
-
-            private final DataSourceIngestModule module;
-            private final String displayName;
-
-            DataSourceIngestModuleDecorator(DataSourceIngestModule module, String displayName) {
-                this.module = module;
-                this.displayName = displayName;
-            }
-
-            String getClassName() {
-                return module.getClass().getCanonicalName();
-            }
-
-            String getDisplayName() {
-                return displayName;
-            }
-
-            @Override
-            public void startUp(IngestJobContext context) throws IngestModuleException {
-               module.startUp(context);
-            }
-
-            @Override
-            public IngestModule.ProcessResult process(Content dataSource, DataSourceIngestModuleStatusHelper statusHelper) {
-                return module.process(dataSource, statusHelper);
-            }
-
-            @Override
-            public void shutDown(boolean ingestJobWasCancelled) {
-                module.shutDown(ingestJobWasCancelled);
-            }            
-        }
+    synchronized ProgressHandle getDataSourceTaskProgressBar() {
+        return this.dataSourceTaskProgress;
     }
 
-    /**
-     * A file ingest pipeline composed of a sequence of file ingest modules
-     * constructed from ingest module templates.
-     */
-    static final class FileIngestPipeline {
-
-        private static final Logger logger = Logger.getLogger(FileIngestPipeline.class.getName());
-        private final IngestJob task;
-        private final List<IngestModuleTemplate> moduleTemplates;
-        private List<FileIngestModuleDecorator> modules = new ArrayList<>();
-
-        private FileIngestPipeline(IngestJob task, List<IngestModuleTemplate> moduleTemplates) {
-            this.task = task;
-            this.moduleTemplates = moduleTemplates;
+    synchronized void updateFileTasksProgressBar(String currentFileName) {
+        int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
+        if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
+            totalEnqueuedFiles = newTotalEnqueuedFiles + 1;
+            fileTasksProgress.switchToIndeterminate();
+            fileTasksProgress.switchToDeterminate(totalEnqueuedFiles);
+        }
+        if (processedFiles < totalEnqueuedFiles) {
+            ++processedFiles;
         }
 
-        private List<IngestModuleError> startUp() {
-            List<IngestModuleError> errors = new ArrayList<>();
-            
-            // Create an ingest module instance from each ingest module template 
-            // that has an ingest module factory capable of making data source 
-            // ingest modules. Map the module class names to the module instance 
-            // to allow the modules to be put in the sequence indicated by the
-            // ingest pipelines configuration.
-            Map<String, FileIngestModuleDecorator> modulesByClass = new HashMap<>();
-            for (IngestModuleTemplate template : moduleTemplates) {
-                if (template.isFileIngestModuleTemplate()) {
-                    FileIngestModuleDecorator module = new FileIngestModuleDecorator(template.createFileIngestModule(), template.getModuleName()); // RJCTODO: Move into try block for bpth impls
-                    IngestJobContext context = new IngestJobContext(task);
-                    try {
-                        module.startUp(context);
-                        modulesByClass.put(module.getClassName(), module);
-                        IngestManager.fireModuleEvent(IngestManager.IngestEvent.STARTED.toString(), template.getModuleName());
-                    } catch (Exception ex) {
-                        errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                    }
-                }
-            }
-            
-            // Establish the module sequence of the core ingest modules 
-            // indicated by the ingest pipeline configuration, adding any 
-            // additional modules found in the global lookup to the end of the 
-            // pipeline in arbitrary order.
-            List<String> pipelineConfig = IngestPipelinesConfiguration.getInstance().getFileIngestPipelineConfig();
-            for (String moduleClassName : pipelineConfig) {
-                if (modulesByClass.containsKey(moduleClassName)) {
-                    modules.add(modulesByClass.remove(moduleClassName));
-                }
-            }
-            for (FileIngestModuleDecorator module : modulesByClass.values()) {
-                modules.add(module);
-            }
-            
-            return errors;
+        fileTasksProgress.progress(currentFileName, processedFiles);
+    }
+
+    synchronized void cancel() {
+        if (initialDataSourceIngestPipeline != null) {
+            initialDataSourceIngestPipeline.shutDown(true);
+            initialDataSourceIngestPipeline =  null;
         }
-
-        List<IngestModuleError> process(AbstractFile file) {
-            List<IngestModuleError> errors = new ArrayList<>();
-            Content dataSource = this.task.getDataSource();
-            logger.log(Level.INFO, String.format("Processing {0} from {1}", file.getName(), dataSource.getName()));
-            for (FileIngestModuleDecorator module : this.modules) {
-                try {
-                    module.process(file);
-                } catch (Exception ex) {
-                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                }
-                if (task.isCancelled()) {
-                    break;
-                }
-            }
-            file.close();
-            IngestManager.fireFileDone(file.getId());
-            return errors;
+        if (initialFileIngestPipeline != null) {
+            initialFileIngestPipeline.shutDown(true);
+            initialFileIngestPipeline = null;
         }
+       
+        cancelled = true;
+    }
 
-        private List<IngestModuleError> shutDown(boolean ingestJobCancelled) {
-            List<IngestModuleError> errors = new ArrayList<>();
-            for (FileIngestModuleDecorator module : this.modules) {
-                try {
-                    module.shutDown(ingestJobCancelled);
-                } catch (Exception ex) {
-                    errors.add(new IngestModuleError(module.getDisplayName(), ex));
-                } finally {
-                    IngestManager.fireModuleEvent(IngestManager.IngestEvent.COMPLETED.toString(), module.getDisplayName());
-                }
-            }
-            return errors;
-        }
-        
-        private static class FileIngestModuleDecorator implements FileIngestModule {
-
-            private final FileIngestModule module;
-            private final String displayName;
-
-            FileIngestModuleDecorator(FileIngestModule module, String displayName) {
-                this.module = module;
-                this.displayName = displayName;
-            }
-
-            String getClassName() {
-                return module.getClass().getCanonicalName();
-            }
-
-            String getDisplayName() {
-                return displayName;
-            }
-
-            @Override
-            public void startUp(IngestJobContext context) throws IngestModuleException {
-               module.startUp(context);
-            }
-
-            @Override
-            public IngestModule.ProcessResult process(AbstractFile file) {
-                return module.process(file);
-            }
-
-            @Override
-            public void shutDown(boolean ingestJobWasCancelled) {
-                module.shutDown(ingestJobWasCancelled);
-            }            
-        }
-    }    
+    boolean isCancelled() {
+        return cancelled;
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.form
index ae6e4c7e93..a0533766ff 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.form
@@ -13,7 +13,7 @@
       <Dimension value="[522, 257]"/>
     </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[575, 300]"/>
+      <Dimension value="[575, 400]"/>
     </Property>
   </Properties>
   <AuxValues>
@@ -48,9 +48,9 @@
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jPanel1" pref="278" max="32767" attributes="0"/>
+                  <Component id="jPanel1" pref="342" max="32767" attributes="0"/>
                   <Group type="102" attributes="0">
-                      <Component id="modulesScrollPane" pref="233" max="32767" attributes="0"/>
+                      <Component id="modulesScrollPane" max="32767" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="processUnallocPanel" max="-2" attributes="0"/>
                   </Group>
@@ -108,24 +108,40 @@
       <Layout>
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="jScrollPane1" alignment="0" pref="326" max="32767" attributes="0"/>
-              <Component id="jSeparator2" alignment="1" max="32767" attributes="0"/>
-              <Group type="102" alignment="1" attributes="0">
-                  <EmptySpace max="32767" attributes="0"/>
-                  <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" max="-2" attributes="0"/>
+              <Group type="102" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="jScrollPane1" pref="316" max="32767" attributes="0"/>
+                      <Group type="102" attributes="0">
+                          <Component id="scrollpane" max="32767" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
               </Group>
+              <Component id="jSeparator2" max="32767" attributes="0"/>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="1" attributes="0">
-                  <Component id="jScrollPane1" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" pref="242" max="32767" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
+                          <Component id="scrollpane" min="-2" pref="65" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Component id="jSeparator2" min="-2" pref="10" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="jSeparator2" min="-2" pref="10" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-                  <Component id="advancedButton" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -136,6 +152,9 @@
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestJobConfigurationPanel.advancedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
+            <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestJobConfigurationPanel.advancedButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
             <Property name="enabled" type="boolean" value="false"/>
           </Properties>
           <Events>
@@ -164,6 +183,40 @@
             </Container>
           </SubComponents>
         </Container>
+        <Container class="javax.swing.JScrollPane" name="scrollpane">
+          <Properties>
+            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+              <Border info="null"/>
+            </Property>
+            <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+            <Property name="verticalScrollBarPolicy" type="int" value="21"/>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+          </AuxValues>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JTextArea" name="descriptionLabel">
+              <Properties>
+                <Property name="editable" type="boolean" value="false"/>
+                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+                  <Color blue="f0" green="f0" red="f0" type="rgb"/>
+                </Property>
+                <Property name="columns" type="int" value="20"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+                  <Font name="Tahoma" size="11" style="0"/>
+                </Property>
+                <Property name="lineWrap" type="boolean" value="true"/>
+                <Property name="rows" type="int" value="5"/>
+                <Property name="wrapStyleWord" type="boolean" value="true"/>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="null"/>
+                </Property>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="processUnallocPanel">
@@ -183,7 +236,7 @@
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="processUnallocCheckbox" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="60" max="32767" attributes="0"/>
+                  <EmptySpace pref="108" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
index 0e0ce8d74d..a0c617a4bd 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
@@ -107,6 +107,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
                     simplePanel.revalidate();
                     simplePanel.repaint();
                     advancedButton.setEnabled(null != selectedModule.getGlobalSettingsPanel());
+                    descriptionLabel.setText(selectedModule.getDescription());
                 }
             }
         });
@@ -131,12 +132,14 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
         jSeparator2 = new javax.swing.JSeparator();
         jScrollPane1 = new javax.swing.JScrollPane();
         simplePanel = new javax.swing.JPanel();
+        scrollpane = new javax.swing.JScrollPane();
+        descriptionLabel = new javax.swing.JTextArea();
         processUnallocPanel = new javax.swing.JPanel();
         processUnallocCheckbox = new javax.swing.JCheckBox();
 
         setMaximumSize(new java.awt.Dimension(5750, 3000));
         setMinimumSize(new java.awt.Dimension(522, 257));
-        setPreferredSize(new java.awt.Dimension(575, 300));
+        setPreferredSize(new java.awt.Dimension(575, 400));
 
         modulesScrollPane.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(160, 160, 160)));
         modulesScrollPane.setPreferredSize(new java.awt.Dimension(160, 160));
@@ -158,6 +161,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
         jPanel1.setPreferredSize(new java.awt.Dimension(338, 257));
 
         advancedButton.setText(org.openide.util.NbBundle.getMessage(IngestJobConfigurationPanel.class, "IngestJobConfigurationPanel.advancedButton.text")); // NOI18N
+        advancedButton.setActionCommand(org.openide.util.NbBundle.getMessage(IngestJobConfigurationPanel.class, "IngestJobConfigurationPanel.advancedButton.actionCommand")); // NOI18N
         advancedButton.setEnabled(false);
         advancedButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -171,25 +175,49 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
         simplePanel.setLayout(new javax.swing.BoxLayout(simplePanel, javax.swing.BoxLayout.PAGE_AXIS));
         jScrollPane1.setViewportView(simplePanel);
 
+        scrollpane.setBorder(null);
+        scrollpane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrollpane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+
+        descriptionLabel.setEditable(false);
+        descriptionLabel.setBackground(new java.awt.Color(240, 240, 240));
+        descriptionLabel.setColumns(20);
+        descriptionLabel.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
+        descriptionLabel.setLineWrap(true);
+        descriptionLabel.setRows(5);
+        descriptionLabel.setWrapStyleWord(true);
+        descriptionLabel.setBorder(null);
+        scrollpane.setViewportView(descriptionLabel);
+
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 326, Short.MAX_VALUE)
-            .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.TRAILING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(advancedButton)
-                .addContainerGap())
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 316, Short.MAX_VALUE)
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addComponent(scrollpane)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(advancedButton)
+                        .addGap(14, 14, 14))))
+            .addComponent(jSeparator2)
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, 0)
-                .addComponent(advancedButton)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 242, Short.MAX_VALUE)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addGap(22, 22, 22)
+                        .addComponent(scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addGap(18, 18, 18)
+                        .addComponent(advancedButton)))
                 .addContainerGap())
         );
 
@@ -210,7 +238,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
             .addGroup(processUnallocPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(processUnallocCheckbox)
-                .addContainerGap(60, Short.MAX_VALUE))
+                .addContainerGap(108, Short.MAX_VALUE))
         );
         processUnallocPanelLayout.setVerticalGroup(
             processUnallocPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -238,15 +266,19 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE)
+                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 342, Short.MAX_VALUE)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(modulesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 233, Short.MAX_VALUE)
+                        .addComponent(modulesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(processUnallocPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
 
+    private void processUnallocCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_processUnallocCheckboxActionPerformed
+        processUnallocatedSpace = processUnallocCheckbox.isSelected();
+    }//GEN-LAST:event_processUnallocCheckboxActionPerformed
+
     private void advancedButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_advancedButtonActionPerformed
         final AdvancedConfigurationDialog dialog = new AdvancedConfigurationDialog();
 
@@ -270,11 +302,9 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
         dialog.display(selectedModule.getGlobalSettingsPanel());
     }//GEN-LAST:event_advancedButtonActionPerformed
 
-    private void processUnallocCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_processUnallocCheckboxActionPerformed
-        processUnallocatedSpace = processUnallocCheckbox.isSelected();
-    }//GEN-LAST:event_processUnallocCheckboxActionPerformed
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton advancedButton;
+    private javax.swing.JTextArea descriptionLabel;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JSeparator jSeparator2;
@@ -282,6 +312,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
     private javax.swing.JTable modulesTable;
     private javax.swing.JCheckBox processUnallocCheckbox;
     private javax.swing.JPanel processUnallocPanel;
+    private javax.swing.JScrollPane scrollpane;
     private javax.swing.JPanel simplePanel;
     private javax.swing.ButtonGroup timeGroup;
     // End of variables declaration//GEN-END:variables
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
index 7d0301ce5c..dc9fb58e3f 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobContext.java
@@ -60,7 +60,7 @@ public final class IngestJobContext {
      */
     public void addFiles(List<AbstractFile> files) {
         for (AbstractFile file : files) {
-            IngestManager.getInstance().scheduleFile(ingestJob.getId(), file);
+            IngestManager.getInstance().addFileToIngestJob(ingestJob.getId(), file);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java
index 7324c3d023..22125647d7 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java
@@ -92,7 +92,7 @@ public final class IngestJobLauncher {
             if (enabledModuleNames.contains(moduleName)) {
                 moduleTemplate.setEnabled(true);
             } else if (disabledModuleNames.contains(moduleName)) {
-                moduleTemplate.setEnabled(true);
+                moduleTemplate.setEnabled(false);
             } else {
                 // The module factory was loaded, but the module name does not
                 // appear in the enabled/disabled module settings. Treat the
@@ -232,7 +232,7 @@ public final class IngestJobLauncher {
         }
 
         if ((!enabledModuleTemplates.isEmpty()) && (dataSources != null) && (!dataSources.isEmpty())) {
-            IngestManager.getInstance().scheduleDataSourceTasks(dataSources, enabledModuleTemplates, ingestConfigPanel.getProcessUnallocSpace());
+            IngestManager.getInstance().startIngestJobs(dataSources, enabledModuleTemplates, ingestConfigPanel.getProcessUnallocSpace());
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 5e3746fe5b..1cc046ac3e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -24,65 +24,143 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
+import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
+import java.util.prefs.Preferences;
+import javax.swing.SwingWorker;
 
 /**
  * Manages the execution of ingest jobs.
  */
 public class IngestManager {
 
+    private static final String NUMBER_OF_FILE_INGEST_THREADS_KEY = "NumberOfFileingestThreads";
+    private static final int MIN_NUMBER_OF_FILE_INGEST_THREADS = 1;
+    private static final int MAX_NUMBER_OF_FILE_INGEST_THREADS = 4;
+    private static final int DEFAULT_NUMBER_OF_FILE_INGEST_THREADS = 2;
     private static final Logger logger = Logger.getLogger(IngestManager.class.getName());
     private static final PropertyChangeSupport pcs = new PropertyChangeSupport(IngestManager.class);
+    private static final Preferences userPreferences = NbPreferences.forModule(IngestManager.class);
     private static IngestManager instance;
-    private final IngestScheduler scheduler;
+    private final IngestScheduler scheduler = IngestScheduler.getInstance();
     private final IngestMonitor ingestMonitor = new IngestMonitor();
-    private final HashMap<Long, IngestJob> ingestJobs = new HashMap<>();
-    private TaskSchedulingWorker taskSchedulingWorker;
-    private FileTaskWorker fileTaskWorker;
-    private DataSourceTaskWorker dataSourceTaskWorker;
-    private long nextDataSourceTaskId = 0;
-    private long nextThreadId = 0;
+    private final ExecutorService startIngestJobsExecutor = Executors.newSingleThreadExecutor();
+    private final ExecutorService dataSourceIngestTasksExecutor = Executors.newSingleThreadExecutor();
+    private final ExecutorService fileIngestTasksExecutor = Executors.newFixedThreadPool(MAX_NUMBER_OF_FILE_INGEST_THREADS);
+    private final HashMap<Long, IngestJob> ingestJobs = new HashMap<>(); // Maps job ids to jobs        
+    private final HashMap<Long, Future<?>> ingestTasks = new HashMap<>(); // Maps task ids to task cancellation handles        
+    private AtomicLong ingestJobId = new AtomicLong(0L);
+    private AtomicLong ingestTaskId = new AtomicLong(0L);
     private volatile IngestUI ingestMessageBox;
 
+    /**
+     * Gets the IngestManager singleton, creating it if necessary.
+     *
+     * @returns The IngestManager singleton.
+     */
+    public synchronized static IngestManager getInstance() {
+        if (instance == null) {
+            instance = new IngestManager();
+        }
+        return instance;
+    }
+
+    private IngestManager() {
+    }
+
+    /**
+     * Finds the top component for the ingest messages in box. Called by the
+     * custom installer for this package once the window system is initialized.
+     */
+    void initIngestMessageInbox() {
+        if (this.ingestMessageBox == null) {
+            this.ingestMessageBox = IngestMessageTopComponent.findInstance();
+        }
+    }
+
+    public synchronized static int getNumberOfFileIngestThreads() {
+        return userPreferences.getInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, DEFAULT_NUMBER_OF_FILE_INGEST_THREADS);
+    }
+
+    public synchronized static void setNumberOfFileIngestThreads(int numberOfThreads) {
+        if (numberOfThreads < MIN_NUMBER_OF_FILE_INGEST_THREADS
+                || numberOfThreads > MAX_NUMBER_OF_FILE_INGEST_THREADS) {
+            numberOfThreads = DEFAULT_NUMBER_OF_FILE_INGEST_THREADS;
+        }
+
+        userPreferences.putInt(NUMBER_OF_FILE_INGEST_THREADS_KEY, numberOfThreads);
+    }
+
+    synchronized void startIngestJobs(final List<Content> dataSources, final List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
+        if (!isIngestRunning() && ingestMessageBox != null) {
+            ingestMessageBox.clearMessages();
+        }
+
+        long taskId = ingestTaskId.incrementAndGet();
+        Future<?> task = startIngestJobsExecutor.submit(new StartIngestJobsTask(taskId, dataSources, moduleTemplates, processUnallocatedSpace));
+        ingestTasks.put(taskId, task);
+
+        if (ingestMessageBox != null) {
+            ingestMessageBox.restoreMessages();
+        }
+    }
+
+    /**
+     * Test if any ingest jobs are in progress.
+     *
+     * @return True if any ingest jobs are in progress, false otherwise
+     */
+    public boolean isIngestRunning() {
+        return (ingestJobs.isEmpty() == false);
+    }
+
+    synchronized void addFileToIngestJob(long ingestJobId, AbstractFile file) {
+        IngestJob job = ingestJobs.get(ingestJobId);
+        if (job != null) {
+            scheduler.getFileScheduler().scheduleFile(job, file);
+        }
+    }
+
+    void cancelIngestJobs() {
+        new IngestCancellationWorker().execute();
+    }
+
     /**
      * Ingest events.
      */
     public enum IngestEvent {
 
-        // RJCTODO: Update comments
         /**
-         * Event sent when an ingest module has been started. Second argument of
-         * the property change is a string form of the module name and the third
-         * argument is null.
+         * Property change event fired when an ingest job is started. The ingest
+         * job id is in old value field of the PropertyChangeEvent object.
          */
-        STARTED,
+        INGEST_JOB_STARTED,
         /**
-         * Event sent when an ingest module has completed processing by its own
-         * means. Second argument of the property change is a string form of the
-         * module name and the third argument is null.
-         *
-         * This event is generally used by listeners to perform a final data
-         * view refresh (listeners need to query all data from the blackboard).
+         * Property change event fired when an ingest job is completed. The
+         * ingest job id is in old value field of the PropertyChangeEvent
+         * object.
          */
-        COMPLETED,
+        INGEST_JOB_COMPLETED,
         /**
-         * Event sent when an ingest module has stopped processing, and likely
-         * not all data has been processed. Second argument of the property
-         * change is a string form of the module name and third argument is
-         * null.
+         * Property change event fired when an ingest job is canceled. The
+         * ingest job id is in old value field of the PropertyChangeEvent
+         * object.
          */
-        STOPPED,
+        INGEST_JOB_CANCELLED,
         /**
-         * Event sent when ingest module posts new data to blackboard or
+         * Event sent when an ingest module posts new data to blackboard or
          * somewhere else. Second argument of the property change fired contains
          * ModuleDataEvent object and third argument is null. The object can
          * contain encapsulated new data created by the module. Listener can
@@ -102,56 +180,22 @@ public class IngestManager {
         FILE_DONE,
     };
 
-    private IngestManager() {
-        this.scheduler = IngestScheduler.getInstance();
-    }
-
     /**
-     * Returns reference to singleton instance.
-     *
-     * @returns Instance of class.
-     */
-    synchronized public static IngestManager getInstance() {
-        if (instance == null) {
-            instance = new IngestManager();
-        }
-        return instance;
-    }
-
-    /**
-     * called by Installer in AWT thread once the Window System is ready
-     */
-    void initIngestMessageInbox() {
-        if (this.ingestMessageBox == null) {
-            this.ingestMessageBox = IngestMessageTopComponent.findInstance();
-        }
-    }
-
-    synchronized private long getNextDataSourceTaskId() {
-        return ++this.nextDataSourceTaskId;
-    }
-
-    synchronized private long getNextThreadId() {
-        return ++this.nextThreadId;
-    }
-
-    /**
-     * Add property change listener to listen to ingest events as defined in
-     * IngestModuleEvent.
+     * Add property change listener to listen to ingest events.
      *
      * @param listener PropertyChangeListener to register
      */
-    public static synchronized void addPropertyChangeListener(final PropertyChangeListener listener) {
+    public static void addPropertyChangeListener(final PropertyChangeListener listener) {
         pcs.addPropertyChangeListener(listener);
     }
 
-    public static synchronized void removePropertyChangeListener(final PropertyChangeListener listener) {
+    public static void removePropertyChangeListener(final PropertyChangeListener listener) {
         pcs.removePropertyChangeListener(listener);
     }
 
-    static synchronized void fireModuleEvent(String eventType, String moduleName) {
+    static void fireIngestJobEvent(String eventType, long jobId) {
         try {
-            pcs.firePropertyChange(eventType, moduleName, null);
+            pcs.firePropertyChange(eventType, jobId, null);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
@@ -163,11 +207,11 @@ public class IngestManager {
     /**
      * Fire event when file is done with a pipeline run
      *
-     * @param objId ID of file that is done
+     * @param fileId ID of file that is done
      */
-    static synchronized void fireFileDone(long objId) {
+    static void fireFileIngestDone(long fileId) {
         try {
-            pcs.firePropertyChange(IngestEvent.FILE_DONE.toString(), objId, null);
+            pcs.firePropertyChange(IngestEvent.FILE_DONE.toString(), fileId, null);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
@@ -182,7 +226,7 @@ public class IngestManager {
      *
      * @param moduleDataEvent
      */
-    static synchronized void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
+    static void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
         try {
             pcs.firePropertyChange(IngestEvent.DATA.toString(), moduleDataEvent, null);
         } catch (Exception e) {
@@ -199,7 +243,7 @@ public class IngestManager {
      *
      * @param moduleContentEvent
      */
-    static synchronized void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
+    static void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
         try {
             pcs.firePropertyChange(IngestEvent.CONTENT_CHANGED.toString(), moduleContentEvent, null);
         } catch (Exception e) {
@@ -210,152 +254,6 @@ public class IngestManager {
         }
     }
 
-    /**
-     * Multiple data-sources version of scheduleDataSource() method. Enqueues
-     * multiple sources inputs (Content objects) and associated modules at once
-     *
-     * @param modules modules to scheduleDataSource on every data source
-     * @param inputs input data sources to enqueue and scheduleDataSource the
-     * ingest modules on
-     */
-    void scheduleDataSourceTasks(final List<Content> dataSources, final List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
-        if (!isIngestRunning() && ingestMessageBox != null) {
-            ingestMessageBox.clearMessages();
-        }
-
-        taskSchedulingWorker = new TaskSchedulingWorker(dataSources, moduleTemplates, processUnallocatedSpace);
-        taskSchedulingWorker.execute();
-
-        if (ingestMessageBox != null) {
-            ingestMessageBox.restoreMessages();
-        }
-    }
-
-    /**
-     * IngestManager entry point, enqueues data to be processed and starts new
-     * ingest as needed, or just enqueues data to an existing pipeline.
-     *
-     * Spawns background thread which enumerates all sorted files and executes
-     * chosen modules per file in a pre-determined order. Notifies modules when
-     * work is complete or should be interrupted using complete() and stop()
-     * calls. Does not block and can be called multiple times to enqueue more
-     * work to already running background ingest process.
-     *
-     * @param modules modules to scheduleDataSource on the data source input
-     * @param input input data source Content objects to scheduleDataSource the
-     * ingest modules on
-     */
-    void scheduleDataSourceTask(final Content dataSource, final List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
-        List<Content> dataSources = new ArrayList<>();
-        dataSources.add(dataSource);
-        scheduleDataSourceTasks(dataSources, moduleTemplates, processUnallocatedSpace);
-    }
-
-    /**
-     * Schedule a file for ingest and add it to ongoing file ingest process on
-     * the same data source. Scheduler updates the current progress.
-     *
-     * The file to be added is usually a product of a currently ran ingest. Now
-     * we want to process this new file with the same ingest context.
-     *
-     * @param file file to be scheduled
-     * @param pipelineContext ingest context used to ingest parent of the file
-     * to be scheduled
-     */
-    void scheduleFile(long ingestJobId, AbstractFile file) {
-        IngestJob job = this.ingestJobs.get(ingestJobId);
-        if (job == null) {
-            logger.log(Level.SEVERE, "Unable to map ingest job id (id = {0}) to an ingest job, failed to schedule file (id = {1})", new Object[]{ingestJobId, file.getId()});
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
-                    "Unable to associate " + file.getName() + " with ingest job, file will not be processed by ingest nodules",
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
-
-        scheduler.getFileScheduler().scheduleFile(job, file);
-    }
-
-    /**
-     * Starts the File-level Ingest Module pipeline and the Data Source-level
-     * Ingest Modules for the queued up data sources and files.
-     *
-     * if AbstractFile module is still running, do nothing and allow it to
-     * consume queue otherwise start /restart AbstractFile worker
-     *
-     * data source ingest workers run per (module,content). Checks if one for
-     * the same (module,content) is already running otherwise start/restart the
-     * worker
-     */
-    private synchronized void startAll() {
-        if (!ingestMonitor.isRunning()) {
-            ingestMonitor.start();
-        }
-
-        if (scheduler.getDataSourceScheduler().hasNext()) {
-            if (dataSourceTaskWorker == null || dataSourceTaskWorker.isDone()) {
-                dataSourceTaskWorker = new DataSourceTaskWorker(getNextThreadId());
-                dataSourceTaskWorker.execute();
-            }
-        }
-
-        if (scheduler.getFileScheduler().hasNext()) {
-            if (fileTaskWorker == null || fileTaskWorker.isDone()) {
-                fileTaskWorker = new FileTaskWorker(getNextThreadId());
-                fileTaskWorker.execute();
-            }
-        }
-    }
-
-    synchronized void reportThreadDone(long threadId) {
-        for (IngestJob job : ingestJobs.values()) {
-            job.releaseIngestPipelinesForThread(threadId);
-            if (job.areIngestPipelinesShutDown()) {
-                ingestJobs.remove(job.getId());
-            }
-        }
-    }
-
-    synchronized void stopAll() {
-        // First get the task scheduling worker to stop. 
-        if (taskSchedulingWorker != null) {
-            taskSchedulingWorker.cancel(true);
-            while (!taskSchedulingWorker.isDone()) {
-                // Wait.
-            }
-            taskSchedulingWorker = null;
-        }
-
-        // Now mark all of the ingest jobs as cancelled. This way the ingest 
-        // modules will know they are being shut down due to cancellation when
-        // the ingest worker threads release their pipelines.
-        for (IngestJob job : ingestJobs.values()) {
-            job.cancel();
-        }
-
-        // Cancel the worker threads.
-        if (dataSourceTaskWorker != null) {
-            dataSourceTaskWorker.cancel(true);
-        }
-        if (fileTaskWorker != null) {
-            fileTaskWorker.cancel(true);
-        }
-
-        // Jettision the remaining tasks. This will dispose of any tasks that
-        // the scheduling worker queued up before it was cancelled.
-        scheduler.getFileScheduler().empty();
-        scheduler.getDataSourceScheduler().empty();
-    }
-
-    /**
-     * Test if any ingest modules are running
-     *
-     * @return true if any module is running, false otherwise
-     */
-    public synchronized boolean isIngestRunning() {
-        return ((taskSchedulingWorker != null && !taskSchedulingWorker.isDone())
-                || (fileTaskWorker != null && !fileTaskWorker.isDone())
-                || (fileTaskWorker != null && !fileTaskWorker.isDone()));
-    }
-
     /**
      * Module publishes message using InegestManager handle Does not block. The
      * message gets enqueued in the GUI thread and displayed in a widget
@@ -384,82 +282,219 @@ public class IngestManager {
         }
     }
 
-    private class TaskSchedulingWorker extends SwingWorker<Object, Void> {
+    private synchronized void startIngestTasks() {
+        if (!ingestMonitor.isRunning()) {
+            ingestMonitor.start();
+        }
 
+        long taskId = ingestTaskId.incrementAndGet();
+        Future<?> task = dataSourceIngestTasksExecutor.submit(new RunDataSourceIngestModulesTask(taskId));
+        ingestTasks.put(taskId, task);
+
+        int numberOfFileTasksRequested = getNumberOfFileIngestThreads();
+        for (int i = 0; i < numberOfFileTasksRequested; ++i) {
+            taskId = ingestTaskId.incrementAndGet();
+            task = fileIngestTasksExecutor.submit(new RunFileSourceIngestModulesTask(taskId));
+            ingestTasks.put(taskId, task);
+        }
+    }
+
+    private synchronized void stopIngestTasks() {
+        // First mark all of the ingest jobs as cancelled. This way the 
+        // ingest modules will know they are being shut down due to 
+        // cancellation when the cancelled run ingest module tasks release 
+        // their pipelines. 
+        for (IngestJob job : ingestJobs.values()) {
+            job.cancel();
+        }
+
+        // Cancel the run ingest module tasks, setting the state of the threads
+        // running them to interrupted.
+        for (Future<?> task : ingestTasks.values()) {
+            task.cancel(true);
+        }
+
+        // Jettision the remaining data source and file ingest tasks.
+        scheduler.getFileScheduler().empty();
+        scheduler.getDataSourceScheduler().empty();
+    }
+
+    synchronized void reportStartIngestJobsTaskDone(long taskId) {
+        ingestTasks.remove(taskId);
+    }
+
+    synchronized void reportRunIngestModulesTaskDone(long taskId) {
+        ingestTasks.remove(taskId);
+
+        List<Long> completedJobs = new ArrayList<>();
+        for (IngestJob job : ingestJobs.values()) {
+            job.releaseIngestPipelinesForThread(taskId);
+            if (job.areIngestPipelinesShutDown() == true) {
+                completedJobs.add(job.getId());
+            }
+        }
+
+        for (Long jobId : completedJobs) {
+            IngestJob job = ingestJobs.remove(jobId);
+            fireIngestJobEvent(job.isCancelled() ? IngestEvent.INGEST_JOB_CANCELLED.toString() : IngestEvent.INGEST_JOB_COMPLETED.toString(), jobId);
+        }
+    }
+
+    private class StartIngestJobsTask implements Runnable {
+
+        private final long id;
         private final List<Content> dataSources;
         private final List<IngestModuleTemplate> moduleTemplates;
         private final boolean processUnallocatedSpace;
         private ProgressHandle progress;
 
-        TaskSchedulingWorker(List<Content> dataSources, List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
+        StartIngestJobsTask(long taskId, List<Content> dataSources, List<IngestModuleTemplate> moduleTemplates, boolean processUnallocatedSpace) {
+            this.id = taskId;
             this.dataSources = dataSources;
             this.moduleTemplates = moduleTemplates;
             this.processUnallocatedSpace = processUnallocatedSpace;
         }
 
         @Override
-        protected Object doInBackground() throws Exception {
-            // Set up a progress bar that can be used to cancel all of the 
-            // ingest jobs currently being performed.
-            final String displayName = "Queueing ingest tasks";
-            progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
-                @Override
-                public boolean cancel() {
-                    logger.log(Level.INFO, "Queueing ingest cancelled by user.");
-                    if (progress != null) {
-                        progress.setDisplayName(displayName + " (Cancelling...)");
-                    }
-                    IngestManager.getInstance().stopAll();
-                    return true;
-                }
-            });
-
-            progress.start(2 * dataSources.size());
-            int processed = 0;
-            for (Content dataSource : dataSources) {
-                if (isCancelled()) {
-                    logger.log(Level.INFO, "Task scheduling thread cancelled");
-                    return null;
-                }
-
-                final String inputName = dataSource.getName();
-                IngestJob ingestJob = new IngestJob(IngestManager.this.getNextDataSourceTaskId(), dataSource, moduleTemplates, processUnallocatedSpace);
-
-                List<IngestModuleError> errors = ingestJob.startUpIngestPipelines();
-                if (!errors.isEmpty()) {
-                    StringBuilder failedModules = new StringBuilder();
-                    for (int i = 0; i < errors.size(); ++i) {
-                        IngestModuleError error = errors.get(i);
-                        String moduleName = error.getModuleDisplayName();
-                        logger.log(Level.SEVERE, "The " + moduleName + " module failed to start up", error.getModuleError());
-                        failedModules.append(moduleName);
-                        if ((errors.size() > 1) && (i != (errors.size() - 1))) {
-                            failedModules.append(",");
+        public void run() {
+            try {
+                final String displayName = "Queueing ingest tasks";
+                progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
+                    @Override
+                    public boolean cancel() {
+                        if (progress != null) {
+                            progress.setDisplayName(displayName + " (Cancelling...)");
                         }
+                        IngestManager.getInstance().cancelIngestJobs();
+                        return true;
+                    }
+                });
+
+                progress.start(2 * dataSources.size());
+                int workUnitsCompleted = 0;
+                for (Content dataSource : dataSources) {
+                    if (Thread.currentThread().isInterrupted()) {
+                        break;
+                    }
+
+                    IngestJob ingestJob = new IngestJob(IngestManager.this.ingestJobId.incrementAndGet(), dataSource, moduleTemplates, processUnallocatedSpace);
+                    List<IngestModuleError> errors = ingestJob.startUpIngestPipelines();
+                    if (!errors.isEmpty()) {
+                        StringBuilder failedModules = new StringBuilder();
+                        for (int i = 0; i < errors.size(); ++i) {
+                            IngestModuleError error = errors.get(i);
+                            String moduleName = error.getModuleDisplayName();
+                            logger.log(Level.SEVERE, "The " + moduleName + " module failed to start up", error.getModuleError());
+                            failedModules.append(moduleName);
+                            if ((errors.size() > 1) && (i != (errors.size() - 1))) {
+                                failedModules.append(",");
+                            }
+                        }
+                        MessageNotifyUtil.Message.error( // RJCTODO: Fix this to show all errors, probably should specify data source name
+                                "Failed to start the following ingest modules: " + failedModules.toString() + " .\n\n"
+                                + "No ingest modules will be run. Please disable the module "
+                                + "or fix the error and restart ingest by right clicking on "
+                                + "the data source and selecting Run Ingest Modules.\n\n"
+                                + "Error: " + errors.get(0).getModuleError().getMessage());
+                        ingestJob.cancel();
+                        break;
+                    }
+
+                    // Save the ingest job for later cleanup of pipelines.
+                    synchronized (IngestManager.this) {
+                        ingestJobs.put(ingestJob.getId(), ingestJob);
+                    }
+
+                    // Queue the data source ingest tasks for the ingest job.
+                    final String inputName = dataSource.getName();
+                    progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted); // RJCTODO: Improve
+                    scheduler.getDataSourceScheduler().schedule(ingestJob);
+                    progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted);
+
+                    // Queue the file ingest tasks for the ingest job.
+                    progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted);
+                    scheduler.getFileScheduler().scheduleIngestOfFiles(ingestJob);
+                    progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted);
+
+                    if (!Thread.currentThread().isInterrupted()) {
+                        startIngestTasks();
+                        fireIngestJobEvent(IngestEvent.INGEST_JOB_STARTED.toString(), ingestJob.getId());
                     }
-                    MessageNotifyUtil.Message.error(
-                            "Failed to start the following ingest modules: " + failedModules.toString() + " .\n\n"
-                            + "No ingest modules will be run. Please disable the module "
-                            + "or fix the error and restart ingest by right clicking on "
-                            + "the data source and selecting Run Ingest Modules.\n\n"
-                            + "Error: " + errors.get(0).getModuleError().getMessage());
-                    return null;
                 }
-
-                // Save the ingest job for later cleanup of pipelines.
-                ingestJobs.put(ingestJob.getId(), ingestJob);
-
-                // Queue the data source ingest tasks for the ingest job.
-                progress.progress("DataSource Ingest" + " " + inputName, processed);
-                scheduler.getDataSourceScheduler().schedule(ingestJob);
-                progress.progress("DataSource Ingest" + " " + inputName, ++processed);
-
-                // Queue the file ingest tasks for the ingest job.
-                progress.progress("File Ingest" + " " + inputName, processed);
-                scheduler.getFileScheduler().scheduleIngestOfFiles(ingestJob);
-                progress.progress("File Ingest" + " " + inputName, ++processed);
+            } catch (Exception ex) {
+                String message = String.format("StartIngestJobsTask (id=%d) caught exception", id);
+                logger.log(Level.SEVERE, message, ex);
+                MessageNotifyUtil.Message.error("An error occurred while starting ingest. Results may only be partial");
+            } finally {
+                progress.finish();
+                reportStartIngestJobsTaskDone(id);
             }
+        }
+    }
 
+    private class RunDataSourceIngestModulesTask implements Runnable {
+
+        private final long id;
+
+        RunDataSourceIngestModulesTask(long taskId) {
+            id = taskId;
+        }
+
+        @Override
+        public void run() {
+            try {
+                IngestScheduler.DataSourceScheduler scheduler = IngestScheduler.getInstance().getDataSourceScheduler();
+                while (scheduler.hasNext()) {
+                    if (Thread.currentThread().isInterrupted()) {
+                        break;
+                    }
+                    IngestJob job = scheduler.next();
+                    job.getDataSourceIngestPipelineForThread(id).process();
+                }
+            } catch (Exception ex) {
+                String message = String.format("RunDataSourceIngestModulesTask (id=%d) caught exception", id);
+                logger.log(Level.SEVERE, message, ex);
+            } finally {
+                reportRunIngestModulesTaskDone(id);
+            }
+        }
+    }
+
+    private class RunFileSourceIngestModulesTask implements Runnable {
+
+        private final long id;
+
+        RunFileSourceIngestModulesTask(long taskId) {
+            id = taskId;
+        }
+
+        @Override
+        public void run() {
+            try {
+                IngestScheduler.FileScheduler fileScheduler = IngestScheduler.getInstance().getFileScheduler();
+                while (fileScheduler.hasNext()) {
+                    if (Thread.currentThread().isInterrupted()) {
+                        break;
+                    }
+                    IngestScheduler.FileScheduler.FileTask task = fileScheduler.next();
+                    IngestJob job = task.getJob();
+                    job.updateFileTasksProgressBar(task.getFile().getName());
+                    job.getFileIngestPipelineForThread(id).process(task.getFile());
+                }
+            } catch (Exception ex) {
+                String message = String.format("RunFileSourceIngestModulesTask (id=%d) caught exception", id);
+                logger.log(Level.SEVERE, message, ex);
+            } finally {
+                reportRunIngestModulesTaskDone(id);
+            }
+        }
+    }
+
+    class IngestCancellationWorker extends SwingWorker<Void, Void> {
+
+        @Override
+        protected Void doInBackground() throws Exception {
+            stopIngestTasks();
             return null;
         }
 
@@ -468,172 +503,8 @@ public class IngestManager {
             try {
                 super.get();
             } catch (CancellationException | InterruptedException ex) {
-                // IngestManager.stopAll() will dispose of all tasks. 
             } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Error while scheduling ingest jobs", ex);
-                MessageNotifyUtil.Message.error("An error occurred while starting ingest. Results may only be partial");
-            } finally {
-                if (!isCancelled()) {
-                    startAll();
-                }
-                progress.finish();
-            }
-        }
-    }
-
-    /**
-     * Performs data source ingest tasks for one or more ingest jobs on a worker
-     * thread.
-     */
-    class DataSourceTaskWorker extends SwingWorker<Object, Void> {
-
-        private final long id;
-        private ProgressHandle progress;
-
-        DataSourceTaskWorker(long threadId) {
-            this.id = threadId;
-        }
-
-        @Override
-        protected Void doInBackground() throws Exception {
-            logger.log(Level.INFO, "Data source ingest thread (id={0}) started", this.id);
-
-            // Set up a progress bar that can be used to cancel all of the 
-            // ingest jobs currently being performed. 
-            progress = ProgressHandleFactory.createHandle("Data source ingest", new Cancellable() {
-                @Override
-                public boolean cancel() {
-                    logger.log(Level.INFO, "Data source ingest thread (id={0}) cancelled", DataSourceTaskWorker.this.id);
-                    if (progress != null) {
-                        progress.setDisplayName(NbBundle.getMessage(this.getClass(),
-                                "IngestManager.DataSourceTaskWorker.process.cancelling",
-                                "Data source ingest"));
-                    }
-                    IngestManager.getInstance().stopAll();
-                    return true;
-                }
-            });
-            progress.start();
-            progress.switchToIndeterminate();
-
-            IngestScheduler.DataSourceScheduler scheduler = IngestScheduler.getInstance().getDataSourceScheduler();
-            while (scheduler.hasNext()) {
-                if (isCancelled()) {
-                    logger.log(Level.INFO, "Data source ingest thread (id={0}) cancelled", this.id);
-                    return null;
-                }
-
-                IngestJob ingestJob = scheduler.next();
-                IngestJob.DataSourceIngestPipeline pipeline = ingestJob.getDataSourceIngestPipelineForThread(this.id);
-                pipeline.process(this, this.progress);
-            }
-
-            logger.log(Level.INFO, "Data source ingest thread (id={0}) completed", this.id);
-            IngestManager.getInstance().reportThreadDone(this.id);
-            return null;
-        }
-
-        @Override
-        protected void done() {
-            try {
-                super.get();
-            } catch (CancellationException | InterruptedException e) {
-                logger.log(Level.INFO, "Data source ingest thread (id={0}) cancelled", this.id);
-                IngestManager.getInstance().reportThreadDone(this.id);
-            } catch (Exception ex) {
-                String message = String.format("Data source ingest thread (id=%d) experienced a fatal error", this.id);
-                logger.log(Level.SEVERE, message, ex);
-                IngestManager.getInstance().reportThreadDone(this.id);
-            } finally {
-                progress.finish();
-            }
-        }
-    }
-
-    /**
-     * Performs file ingest tasks for one or more ingest jobs on a worker
-     * thread.
-     */
-    class FileTaskWorker extends SwingWorker<Object, Void> {
-
-        private final long id;
-        private ProgressHandle progress;
-
-        FileTaskWorker(long threadId) {
-            this.id = threadId;
-        }
-
-        @Override
-        protected Object doInBackground() throws Exception {
-            logger.log(Level.INFO, "File ingest thread (id={0}) started", this.id);
-
-            // Set up a progress bar that can be used to cancel all of the 
-            // ingest jobs currently being performed. 
-            final String displayName = NbBundle
-                    .getMessage(this.getClass(), "IngestManager.FileTaskWorker.displayName");
-            progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
-                @Override
-                public boolean cancel() {
-                    logger.log(Level.INFO, "File ingest thread (id={0}) cancelled", FileTaskWorker.this.id);
-                    if (progress != null) {
-                        progress.setDisplayName(
-                                NbBundle.getMessage(this.getClass(), "IngestManager.FileTaskWorker.process.cancelling",
-                                displayName));
-                    }
-                    IngestManager.getInstance().stopAll();
-                    return true;
-                }
-            });
-            progress.start();
-            progress.switchToIndeterminate();
-            IngestScheduler.FileScheduler fileScheduler = IngestScheduler.getInstance().getFileScheduler();
-            int totalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
-            progress.switchToDeterminate(totalEnqueuedFiles);
-
-            int processedFiles = 0;
-            while (fileScheduler.hasNext()) {
-                if (isCancelled()) {
-                    IngestManager.getInstance().reportThreadDone(this.id);
-                    logger.log(Level.INFO, "File ingest thread (id={0}) cancelled", this.id);
-                    return null;
-                }
-
-                IngestScheduler.FileScheduler.FileTask task = fileScheduler.next();
-                AbstractFile file = task.getFile();
-                progress.progress(file.getName(), processedFiles);
-                IngestJob.FileIngestPipeline pipeline = task.getJob().getFileIngestPipelineForThread(this.id);
-                pipeline.process(file);
-
-                // Update the progress bar.
-                int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
-                if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
-                    totalEnqueuedFiles = newTotalEnqueuedFiles + 1;
-                    progress.switchToIndeterminate();
-                    progress.switchToDeterminate(totalEnqueuedFiles);
-                }
-                if (processedFiles < totalEnqueuedFiles) {
-                    ++processedFiles;
-                }
-            }
-
-            logger.log(Level.INFO, "File ingest thread (id={0}) completed", this.id);
-            IngestManager.getInstance().reportThreadDone(this.id);
-            return null;
-        }
-
-        @Override
-        protected void done() {
-            try {
-                super.get();
-            } catch (CancellationException | InterruptedException e) {
-                logger.log(Level.INFO, "File ingest thread (id={0}) cancelled", this.id);
-                IngestManager.getInstance().reportThreadDone(this.id);
-            } catch (Exception ex) {
-                String message = String.format("File ingest thread {0} experienced a fatal error", this.id);
-                logger.log(Level.SEVERE, message, ex);
-                IngestManager.getInstance().reportThreadDone(this.id);
-            } finally {
-                progress.finish();
+                logger.log(Level.SEVERE, "Error while cancelling ingest jobs", ex);
             }
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
index eb695fcc7f..e60e9c634d 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
 import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 
@@ -48,7 +49,8 @@ public class IngestMessage {
     private Date datePosted;
     private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     private static int managerMessageId = 0;
-
+    private static AtomicLong nextMessageID = new AtomicLong(0);
+    
     /**
      * Private constructor used by factory methods
      */
@@ -175,11 +177,12 @@ public class IngestMessage {
      * @param detailsHtml html formatted detailed message (without leading and closing &lt;html&gt; tags), for instance, a human-readable representation of the data. Or null.
      * @return 
      */
-    public static IngestMessage createMessage(long ID, MessageType messageType, String source, String subject, String detailsHtml) {
+    public static IngestMessage createMessage(MessageType messageType, String source, String subject, String detailsHtml) {
         if (messageType == null || source == null || subject == null) {
             throw new IllegalArgumentException(
                     NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.typeSrcSubjNotNull.msg"));
         }
+        long ID = nextMessageID.getAndIncrement();
         return new IngestMessage(ID, messageType, source, subject, detailsHtml, null);
     }
 
@@ -191,8 +194,8 @@ public class IngestMessage {
      * @param subject message subject to be displayed
      * @return 
      */
-    public static IngestMessage createMessage(long ID, MessageType messageType, String source, String subject) {
-        return createMessage(ID, messageType, source, subject, null);
+    public static IngestMessage createMessage(MessageType messageType, String source, String subject) {
+        return createMessage(messageType, source, subject, null);
     }
 
     
@@ -204,11 +207,12 @@ public class IngestMessage {
      * @param detailsHtml html formatted detailed message (without leading and closing &lt;html&gt; tags), for instance, a human-readable representation of the data.  Or null
      * @return 
      */
-    public static IngestMessage createErrorMessage(long ID, String source, String subject, String detailsHtml) {
+    public static IngestMessage createErrorMessage(String source, String subject, String detailsHtml) {
         if (source == null || subject == null) {
             throw new IllegalArgumentException(
                     NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjNotNull.msg"));
         }
+        long ID = nextMessageID.getAndIncrement();        
         return new IngestMessage(ID, MessageType.ERROR, source, subject, detailsHtml, null);
     }
     
@@ -220,11 +224,12 @@ public class IngestMessage {
      * @param detailsHtml html formatted detailed message (without leading and closing &lt;html&gt; tags), for instance, a human-readable representation of the data.  Or null 
      * @return 
      */
-    public static IngestMessage createWarningMessage(long ID, String source, String subject, String detailsHtml) {
+    public static IngestMessage createWarningMessage(String source, String subject, String detailsHtml) {
         if (source == null || subject == null) {
             throw new IllegalArgumentException(
                     NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjNotNull.msg"));
         }
+        long ID = nextMessageID.getAndIncrement();        
         return new IngestMessage(ID, MessageType.WARNING, source, subject, detailsHtml, null);
     }
 
@@ -238,12 +243,13 @@ public class IngestMessage {
      * @param data  blackboard artifact associated with the message, the same as fired in ModuleDataEvent by the module
      * @return 
      */
-    public static IngestMessage createDataMessage(long ID, String source, String subject, String detailsHtml, String uniqueKey, BlackboardArtifact data) {
+    public static IngestMessage createDataMessage(String source, String subject, String detailsHtml, String uniqueKey, BlackboardArtifact data) {
         if (source == null || subject == null || detailsHtml == null || data == null) {
             throw new IllegalArgumentException(
                     NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjDetailsDataNotNull.msg"));
         }
-
+        
+        long ID = nextMessageID.getAndIncrement();        
         IngestMessage im = new IngestMessage(ID, MessageType.DATA, source, subject, detailsHtml, uniqueKey);
         im.data = data;
         return im;
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index 7596e1f4cd..24dae0f312 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -395,18 +395,18 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
         
         @Override
-        synchronized public int getRowCount() {
+        public synchronized int getRowCount() {
             return getNumberGroups();
         }
         
-        public void markAllSeen() {
+        public synchronized void markAllSeen() {
             for (TableEntry entry : messageData) {
                 entry.hasBeenSeen(true);
             }
             fireTableChanged(new TableModelEvent(this));
         }
         
-        public int getNumberNewMessages() {
+        public synchronized int getNumberNewMessages() {
             int newMessages = 0;
             for (TableEntry entry : messageData) {
                 if (!entry.hasBeenSeen()) {
@@ -416,11 +416,11 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             return newMessages;
         }
 
-        synchronized int getNumberGroups() {
+        public synchronized int getNumberGroups() {
             return messageData.size();
         }
 
-        synchronized int getNumberMessages() {
+        public synchronized int getNumberMessages() {
             int total = 0;
             for (TableEntry e : messageData) {
                 total += e.messageGroup.getCount();
@@ -428,7 +428,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             return total;
         }
 
-        synchronized int getNumberUnreadMessages() {
+        public synchronized int getNumberUnreadMessages() {
             int total = 0;
             for (TableEntry e : messageData) {
                 if (!e.hasBeenVisited) {
@@ -438,7 +438,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             return total;
         }
 
-        synchronized int getNumberUnreadGroups() {
+        public synchronized int getNumberUnreadGroups() {
             int total = 0;
             for (TableEntry e : messageData) {
                 if (!e.hasBeenVisited) {
@@ -513,7 +513,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             return ret;
         }
 
-        synchronized public void addMessage(IngestMessage m) {
+        public synchronized void addMessage(IngestMessage m) {
             //check how many messages per module with the same uniqness
             //and add to existing group or create a new group
             String moduleName = m.getSource();
@@ -628,15 +628,27 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
 
         public synchronized boolean isVisited(int rowNumber) {
-            return messageData.get(rowNumber).hasBeenVisited();
+            if (rowNumber < messageData.size()) {
+                return messageData.get(rowNumber).hasBeenVisited();
+            } else {
+                return false;
+            }
         }
 
         public synchronized MessageType getMessageType(int rowNumber) {
-            return messageData.get(rowNumber).messageGroup.getMessageType();
+            if (rowNumber < messageData.size()) {
+                return messageData.get(rowNumber).messageGroup.getMessageType();
+            } else {
+                return null;
+            }
         }
 
         public synchronized IngestMessageGroup getMessageGroup(int rowNumber) {
-            return messageData.get(rowNumber).messageGroup;
+            if (rowNumber < messageData.size()) {
+                return messageData.get(rowNumber).messageGroup;
+            } else {
+                return null;
+            }
         }
 
         public synchronized void reSort(boolean chronoLogical) {
@@ -701,26 +713,26 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             messages.add(message);
         }
 
-        List<IngestMessage> getMessages() {
+        private List<IngestMessage> getMessages() {
             return messages;
-        }
-
-        void add(IngestMessage message) {
+        }        
+        
+        synchronized void add(IngestMessage message) {
             messages.add(message);
         }
 
         //add all messages from another group
-        void addAll(IngestMessageGroup group) {
+        synchronized void addAll(IngestMessageGroup group) {
             for (IngestMessage m : group.getMessages()) {
                 messages.add(m);
             }
         }
 
-        int getCount() {
+        synchronized int getCount() {
             return messages.size();
         }
 
-        String getDetails() {
+       synchronized String getDetails() {
             StringBuilder b = new StringBuilder("");
             for (IngestMessage m : messages) {
                 String details = m.getDetails();
@@ -739,7 +751,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
          * return color corresp to priority
          * @return 
          */
-        Color getColor() {
+        synchronized Color getColor() {
             int count = messages.size();
             if (count == 1) {
                 return VERY_HIGH_PRI_COLOR;
@@ -757,7 +769,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
          * used for chrono sort
          * @return 
          */
-        Date getDatePosted() {
+        synchronized Date getDatePosted() {
             return messages.get(messages.size() - 1).getDatePosted();
         }
 
@@ -765,35 +777,35 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
          * get subject of the first message
          * @return 
          */
-        String getSubject() {
+        synchronized String getSubject() {
             return messages.get(0).getSubject();
         }
 
         /*
          * return unique key, should be the same for all msgs
          */
-        String getUniqueKey() {
+        synchronized String getUniqueKey() {
             return messages.get(0).getUniqueKey();
         }
 
         /*
          * return source module, should be the same for all msgs
          */
-        String getSource() {
+        synchronized String getSource() {
             return messages.get(0).getSource();
         }
 
         /*
          * return data of the first message
          */
-        BlackboardArtifact getData() {
+        synchronized BlackboardArtifact getData() {
             return messages.get(0).getData();
         }
 
         /*
          * return message type, should be the same for all msgs
          */
-        IngestMessage.MessageType getMessageType() {
+        synchronized IngestMessage.MessageType getMessageType() {
             return messages.get(0).getMessageType();
         }
     }
@@ -858,16 +870,17 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             cell.setFont(new Font("", Font.PLAIN, 16));
             
             final IngestMessageGroup messageGroup = tableModel.getMessageGroup(row);
-            MessageType mt = messageGroup.getMessageType();
-            if (mt == MessageType.ERROR) {
-                cell.setBackground(ERROR_COLOR);
-            } else if (mt == MessageType.WARNING) {
-                cell.setBackground(Color.orange);
-            } else {
-                //cell.setBackground(table.getBackground());
-                cell.setBackground(messageGroup.getColor());
+            if (messageGroup != null) {
+                MessageType mt = messageGroup.getMessageType();
+                if (mt == MessageType.ERROR) {
+                    cell.setBackground(ERROR_COLOR);
+                } else if (mt == MessageType.WARNING) {
+                    cell.setBackground(Color.orange);
+                } else {
+                    //cell.setBackground(table.getBackground());
+                    cell.setBackground(messageGroup.getColor());
+                }
             }
-            
             return cell;
         }
     }
@@ -898,16 +911,17 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             }
 
             final IngestMessageGroup messageGroup = tableModel.getMessageGroup(row);
-            MessageType mt = messageGroup.getMessageType();
-            if (mt == MessageType.ERROR) {
-                cell.setBackground(ERROR_COLOR);
-            } else if (mt == MessageType.WARNING) {
-                cell.setBackground(Color.orange);
-            } else {
-                //cell.setBackground(table.getBackground());
-                cell.setBackground(messageGroup.getColor());
+            if (messageGroup != null) {
+                MessageType mt = messageGroup.getMessageType();
+                if (mt == MessageType.ERROR) {
+                    cell.setBackground(ERROR_COLOR);
+                } else if (mt == MessageType.WARNING) {
+                    cell.setBackground(Color.orange);
+                } else {
+                    //cell.setBackground(table.getBackground());
+                    cell.setBackground(messageGroup.getColor());
+                }
             }
-
             return cell;
         }
     }
@@ -933,14 +947,16 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             Component cell =  super.getTableCellRendererComponent(table, aValue, isSelected, hasFocus, row, column);
             
             final IngestMessageGroup messageGroup = tableModel.getMessageGroup(row);
-            MessageType mt = messageGroup.getMessageType();
-            if (mt == MessageType.ERROR) {
-                cell.setBackground(ERROR_COLOR);
-            } else if (mt == MessageType.WARNING) {
-                cell.setBackground(Color.orange);
-            } else {
-                //cell.setBackground(table.getBackground());
-                cell.setBackground(messageGroup.getColor());
+            if (messageGroup != null) {
+                MessageType mt = messageGroup.getMessageType();
+                if (mt == MessageType.ERROR) {
+                    cell.setBackground(ERROR_COLOR);
+                } else if (mt == MessageType.WARNING) {
+                    cell.setBackground(Color.orange);
+                } else {
+                    //cell.setBackground(table.getBackground());
+                    cell.setBackground(messageGroup.getColor());
+                }
             }
             
             return cell;
@@ -974,9 +990,11 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
                 messageTable.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                 //check if has details
                 IngestMessageGroup m = getMessageGroup(selected);
-                String details = m.getDetails();
-                if (details != null && !details.equals("")) {
-                    mainPanel.showDetails(selected);
+                if (m != null) {
+                    String details = m.getDetails();
+                    if (details != null && !details.equals("")) {
+                        mainPanel.showDetails(selected);
+                    }
                 }
                 messageTable.setCursor(null);
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
index d8971c476e..b5feb6220c 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
@@ -224,7 +224,7 @@ import org.sleuthkit.datamodel.Content;
                         manager = IngestManager.getInstance();
                     }
                     try {
-                        manager.stopAll();
+                        manager.cancelIngestJobs();
                     } finally {
                         //clear inbox 
                         clearMessages();
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModule.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModule.java
index 364df37257..232d916c3b 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModule.java
@@ -20,27 +20,29 @@ package org.sleuthkit.autopsy.ingest;
 
 /**
  * The interface that must be implemented by all ingest modules.
- * <p>
+ * 
  * Autopsy will generally use several instances of an ingest module for each
- * ingest job it performs. Completing an ingest job entails processing a single
- * data source (e.g., a disk image) and all of the files from the data source,
- * including files extracted from archives and any unallocated space (made to
- * look like a series of files). The data source is passed through one or more
- * pipelines of data source ingest modules. The files are passed through one or
- * more pipelines of file ingest modules.
- * <p>
+ * ingest job it performs (one for each thread that it is using). 
+ * 
+ * Autopsy will call startUp() before any data is processed, will pass any
+ * data to be analyzed into the process() method (FileIngestModule.process() or DataSourceIngestModule.process()),
+ * and call shutDown() after
+ * either all data is analyzed or the has has cancelled the job.
+ *
  * Autopsy may use multiple threads to complete an ingest job, but it is
- * guaranteed that there will be no more than one module instance per thread.
- * However, if the module instances must share resources, the modules are
+ * guaranteed that a module instance will always be called from a single thread. 
+ * Therefore, you can easily have thread-safe code by not using any static 
+ * member variables.
+ *
+ * If the module instances must share resources, the modules are
  * responsible for synchronizing access to the shared resources and doing
  * reference counting as required to release those resources correctly. Also,
  * more than one ingest job may be in progress at any given time. This must also
  * be taken into consideration when sharing resources between module instances.
- * <p>
+ *
  * TIP: An ingest module that does not require initialization or clean up may
  * extend the abstract IngestModuleAdapter class to get a default "do nothing"
  * implementation of this interface.
- *
  */
 public interface IngestModule {
 
@@ -70,27 +72,13 @@ public interface IngestModule {
      * Invoked by Autopsy to allow an ingest module instance to set up any
      * internal data structures and acquire any private resources it will need
      * during an ingest job.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
+     *
+     * If the module depends on loading any resources, it should do so in this 
+     * method so that it can throw an exception in the case of an error and 
+     * alert the user.  Exceptions that are thrown from process() and shutDown()
+     * are logged, but do not stop processing of the data source. 
+     *
+     * On error, throw a IngestModuleException.
      *
      * @param context Provides data and services specific to the ingest job and
      * the ingest pipeline of which the module is a part.
@@ -99,31 +87,13 @@ public interface IngestModule {
     void startUp(IngestJobContext context) throws IngestModuleException;
 
     /**
-     * Invoked by Autopsy when an ingest job is completed, before the ingest
+     * Invoked by Autopsy when an ingest job is completed (either because the
+     * data has been analyzed or because the job was cancelled), before the ingest
      * module instance is discarded. The module should respond by doing things
      * like releasing private resources, submitting final results, and posting a
      * final ingest message.
-     * <p>
-     * Autopsy will generally use several instances of an ingest module for each
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
+     * @param ingestJobWasCancelled True if this is being called because the user
+     * cancelled the job. 
      */
     void shutDown(boolean ingestJobWasCancelled);
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAdapter.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAdapter.java
index 93379de7d4..4187704bc1 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAdapter.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAdapter.java
@@ -23,7 +23,6 @@ package org.sleuthkit.autopsy.ingest;
  * interface.
  */
 public abstract class IngestModuleAdapter implements IngestModule {
-
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
index a9baf59e32..d097ff557c 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
@@ -23,10 +23,10 @@ package org.sleuthkit.autopsy.ingest;
  * modules. An ingest module factory is used to create instances of a type of
  * data source ingest module, a type of file ingest module, or both.
  * <p>
- * Autopsy will generally use the factory to several instances of each type of
- * module for each ingest job it performs. Completing an ingest job entails
- * processing a single data source (e.g., a disk image) and all of the files
- * from the data source, including files extracted from archives and any
+ * Autopsy will generally use the factory to create several instances of each
+ * type of module for each ingest job it performs. Completing an ingest job
+ * entails processing a single data source (e.g., a disk image) and all of the
+ * files from the data source, including files extracted from archives and any
  * unallocated space (made to look like a series of files). The data source is
  * passed through one or more pipelines of data source ingest modules. The files
  * are passed through one or more pipelines of file ingest modules.
@@ -52,7 +52,7 @@ package org.sleuthkit.autopsy.ingest;
  * @ServiceProvider(service=IngestModuleFactory.class)
  * <p>
  * IMPORTANT TIP: If an implementation of IngestModuleFactory does not need to
- * provide implementations of all of the IngestModuleFactory methods, it can 
+ * provide implementations of all of the IngestModuleFactory methods, it can
  * extend the abstract class IngestModuleFactoryAdapter to get default
  * implementations of most of the IngestModuleFactory methods.
  */
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
index 49813595c0..f6ac5e1e49 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.logging.Level;
@@ -27,7 +28,7 @@ import org.openide.util.Lookup;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
- * Looks up loaded ingest module factories using the NetBean global lookup.
+ * Looks up loaded ingest module factories using the NetBeans global lookup.
  */
 final class IngestModuleFactoryLoader {
 
@@ -43,20 +44,57 @@ final class IngestModuleFactoryLoader {
         }
         return instance;
     }
-
+    
     synchronized List<IngestModuleFactory> getIngestModuleFactories() {
-        List<IngestModuleFactory> moduleFactories = new ArrayList<>();
+        // Discover the ingest module factories, making sure that there are no
+        // duplicate module display names. The duplicates requirement could be
+        // eliminated if the enabled/disabled modules setting was by factory 
+        // class name instead of module display name. Also note that that we are 
+        // temporarily  hard-coding ordering of module factories until the 
+        // module configuration file is reworked, so the discovered factories 
+        // are initially mapped by class name.
         HashSet<String> moduleDisplayNames = new HashSet<>();
+        HashMap<String, IngestModuleFactory> moduleFactoriesByClass = new HashMap<>();
         Collection<? extends IngestModuleFactory> factories = Lookup.getDefault().lookupAll(IngestModuleFactory.class);
         for (IngestModuleFactory factory : factories) {
             logger.log(Level.INFO, "Found ingest module factory: name = {0}, version = {1}", new Object[]{factory.getModuleDisplayName(), factory.getModuleVersionNumber()});
             if (!moduleDisplayNames.contains(factory.getModuleDisplayName())) {
-                moduleFactories.add(factory);
+                moduleFactoriesByClass.put(factory.getClass().getCanonicalName(), factory);
                 moduleDisplayNames.add(factory.getModuleDisplayName());
             } else {
+                // Not popping up a message box to keep this class UI-indepdent.
                 logger.log(Level.SEVERE, "Found duplicate ingest module display name, discarding ingest module factory (name = {0}", new Object[]{factory.getModuleDisplayName(), factory.getModuleVersionNumber()});
             }
         }
-        return new ArrayList<>(moduleFactories);
+        
+        // Kick out the sample modules factory.
+        moduleFactoriesByClass.remove("org.sleuthkit.autopsy.examples.SampleIngestModuleFactory");
+        
+        // Do the core ingest module ordering hack described above.
+        ArrayList<String> coreModuleOrdering = new ArrayList<String>() {{
+            add("org.sleuthkit.autopsy.recentactivity.RecentActivityExtracterModuleFactory");
+            add("org.sleuthkit.autopsy.ewfverify.EwfVerifierModuleFactory");
+            add("org.sleuthkit.autopsy.hashdatabase.HashLookupModuleFactory");
+            add("org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory");
+            add("org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory");
+            add("org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory");
+            add("org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory");
+            add("org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory");
+            add("org.sleuthkit.autopsy.fileextmismatch.FileExtMismatchDetectorModuleFactory");
+        }};
+        List<IngestModuleFactory> orderedModuleFactories = new ArrayList<>();
+        for (String className : coreModuleOrdering) {
+            IngestModuleFactory coreFactory = moduleFactoriesByClass.remove(className);
+            if (coreFactory != null) {
+                orderedModuleFactories.add(coreFactory);
+            }
+        }
+        
+        // Add in any non-core factories discovered. Order is not guaranteed!
+        for (IngestModuleFactory nonCoreFactory : moduleFactoriesByClass.values()) {
+            orderedModuleFactories.add(nonCoreFactory);
+        }
+        
+        return orderedModuleFactories;
     }
 }
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleReferenceCounter.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleReferenceCounter.java
new file mode 100644
index 0000000000..1382be299c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleReferenceCounter.java
@@ -0,0 +1,59 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011 - 2013 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.sleuthkit.autopsy.ingest;
+
+import java.util.HashMap;
+
+/**
+ * A utility class that modules can use to keep track of whether they are the 
+ * first/last instance for a particular job.
+ * 
+ * An instance of this should be static in your module class.
+ */
+public class IngestModuleReferenceCounter {
+    // Maps a JobId to the count of instances
+    private HashMap<Long, Long> moduleRefCount = new HashMap<>(); 
+
+    public synchronized long get(long jobId) {
+        return moduleRefCount.get(jobId);
+    }
+    
+    public synchronized long incrementAndGet(long jobId) {
+        long count = moduleRefCount.containsKey(jobId) ? moduleRefCount.get(jobId) : 0;
+        long nextCount = count + 1;
+        moduleRefCount.put(jobId, nextCount);
+        return nextCount;
+    }
+
+    public synchronized long decrementAndGet(long jobId) {
+        if (moduleRefCount.containsKey(jobId)) {
+            long count = moduleRefCount.get(jobId);
+            if (--count == 0) {
+                moduleRefCount.remove(jobId);
+            } else {
+                moduleRefCount.put(jobId, count);
+            }
+            return count;
+        } else {
+            return -1;
+        }
+    }    
+}
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
index dde9704379..5c311363fd 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
@@ -163,9 +163,9 @@ public final class IngestMonitor {
             if (checkDiskSpace() == false) {
                 //stop ingest if running
                 final String diskPath = root.getAbsolutePath();
-                MONITOR_LOGGER.log(Level.SEVERE, "Stopping ingest due to low disk space on disk " + diskPath);
-                logger.log(Level.SEVERE, "Stopping ingest due to low disk space on disk " + diskPath);
-                manager.stopAll();
+                MONITOR_LOGGER.log(Level.SEVERE, "Stopping ingest due to low disk space on disk {0}", diskPath);
+                logger.log(Level.SEVERE, "Stopping ingest due to low disk space on disk {0}", diskPath);
+                manager.cancelIngestJobs();
                 IngestServices.getInstance().postMessage(IngestMessage.createManagerErrorMessage(
                         NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.title", diskPath),
                         NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.msg", diskPath)));
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
index 5c93b9d102..b834d13f62 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestPipelinesConfiguration.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
 import org.w3c.dom.Document;
@@ -39,12 +40,15 @@ import org.w3c.dom.NodeList;
 final class IngestPipelinesConfiguration {
 
     private static final Logger logger = Logger.getLogger(IngestPipelinesConfiguration.class.getName());
-    private final static String PIPELINES_CONFIG_FILE = "pipeline_config.xml";
-    private final static String PIPELINES_CONFIG_FILE_XSD = "PipelineConfigSchema.xsd";
+    private static final String PIPELINE_CONFIG_FILE_VERSION_KEY = "PipelineConfigFileVersion";
+    private static final String PIPELINE_CONFIG_FILE_VERSION_NO_STRING = "1";
+    private static final int PIPELINE_CONFIG_FILE_VERSION_NO = 1;
+    private static final String PIPELINES_CONFIG_FILE = "pipeline_config.xml";
+    private static final String PIPELINES_CONFIG_FILE_XSD = "PipelineConfigSchema.xsd";
     private static final String XML_PIPELINE_ELEM = "PIPELINE";
     private static final String XML_PIPELINE_TYPE_ATTR = "type";
-    private final static String DATA_SOURCE_INGEST_PIPELINE_TYPE = "ImageAnalysis";
-    private final static String FILE_INGEST_PIPELINE_TYPE = "FileAnalysis";
+    private static final String DATA_SOURCE_INGEST_PIPELINE_TYPE = "ImageAnalysis";
+    private static final String FILE_INGEST_PIPELINE_TYPE = "FileAnalysis";
     private static final String XML_MODULE_ELEM = "MODULE";
     private static final String XML_MODULE_CLASS_NAME_ATTR = "location";
     private static IngestPipelinesConfiguration instance;
@@ -73,65 +77,73 @@ final class IngestPipelinesConfiguration {
 
     private void readPipelinesConfigurationFile() {
         try {
-            PlatformUtil.extractResourceToUserConfigDir(IngestPipelinesConfiguration.class, PIPELINES_CONFIG_FILE);
-        } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Error copying default pipeline configuration to user dir", ex);
-            return;
-        }
-        
-        String configFilePath = PlatformUtil.getUserConfigDirectory() + File.separator + PIPELINES_CONFIG_FILE;
-        Document doc = XMLUtil.loadDoc(IngestPipelinesConfiguration.class, configFilePath, PIPELINES_CONFIG_FILE_XSD);
-        if (doc == null) {
-            return;
-        }
+            boolean overWrite;
+            if (!ModuleSettings.settingExists(this.getClass().getSimpleName(), PIPELINE_CONFIG_FILE_VERSION_KEY)) {
+                ModuleSettings.setConfigSetting(this.getClass().getSimpleName(), PIPELINE_CONFIG_FILE_VERSION_KEY, PIPELINE_CONFIG_FILE_VERSION_NO_STRING);
+                overWrite = true;
+            } else {
+                int versionNumber = Integer.parseInt(ModuleSettings.getConfigSetting(this.getClass().getSimpleName(), PIPELINE_CONFIG_FILE_VERSION_KEY));
+                overWrite = versionNumber < PIPELINE_CONFIG_FILE_VERSION_NO;
+                // TODO: Migrate user edits
+            }
+            PlatformUtil.extractResourceToUserConfigDir(IngestPipelinesConfiguration.class, PIPELINES_CONFIG_FILE, overWrite);
 
-        Element rootElement = doc.getDocumentElement();
-        if (rootElement == null) {
-            logger.log(Level.SEVERE, "Invalid pipelines config file");
-            return;
-        }
-
-        NodeList pipelineElements = rootElement.getElementsByTagName(XML_PIPELINE_ELEM);
-        int numPipelines = pipelineElements.getLength();
-        if (numPipelines < 1 || numPipelines > 2) {
-            logger.log(Level.SEVERE, "Invalid pipelines config file");
-            return;
-        }
-
-        List<String> pipelineConfig = null;
-        for (int pipelineNum = 0; pipelineNum < numPipelines; ++pipelineNum) {
-            Element pipelineElement = (Element) pipelineElements.item(pipelineNum);
-            String pipelineTypeAttr = pipelineElement.getAttribute(XML_PIPELINE_TYPE_ATTR);
-            if (pipelineTypeAttr != null) {
-                switch (pipelineTypeAttr) {
-                    case DATA_SOURCE_INGEST_PIPELINE_TYPE:
-                        pipelineConfig = dataSourceIngestPipelineConfig;
-                        break;
-                    case FILE_INGEST_PIPELINE_TYPE:
-                        pipelineConfig = fileIngestPipelineConfig;
-                        break;
-                    default:
-                        logger.log(Level.SEVERE, "Invalid pipelines config file");
-                        return;
-                }
+            String configFilePath = PlatformUtil.getUserConfigDirectory() + File.separator + PIPELINES_CONFIG_FILE;
+            Document doc = XMLUtil.loadDoc(IngestPipelinesConfiguration.class, configFilePath, PIPELINES_CONFIG_FILE_XSD);
+            if (doc == null) {
+                return;
             }
 
-            // Create an ordered list of class names. The sequence of class 
-            // names defines the sequence of modules in the pipeline.
-            if (pipelineConfig != null) {
-                NodeList modulesElems = pipelineElement.getElementsByTagName(XML_MODULE_ELEM);
-                int numModules = modulesElems.getLength();
-                if (numModules == 0) {
-                    break;
+            Element rootElement = doc.getDocumentElement();
+            if (rootElement == null) {
+                logger.log(Level.SEVERE, "Invalid pipelines config file");
+                return;
+            }
+
+            NodeList pipelineElements = rootElement.getElementsByTagName(XML_PIPELINE_ELEM);
+            int numPipelines = pipelineElements.getLength();
+            if (numPipelines < 1 || numPipelines > 2) {
+                logger.log(Level.SEVERE, "Invalid pipelines config file");
+                return;
+            }
+
+            List<String> pipelineConfig = null;
+            for (int pipelineNum = 0; pipelineNum < numPipelines; ++pipelineNum) {
+                Element pipelineElement = (Element) pipelineElements.item(pipelineNum);
+                String pipelineTypeAttr = pipelineElement.getAttribute(XML_PIPELINE_TYPE_ATTR);
+                if (pipelineTypeAttr != null) {
+                    switch (pipelineTypeAttr) {
+                        case DATA_SOURCE_INGEST_PIPELINE_TYPE:
+                            pipelineConfig = dataSourceIngestPipelineConfig;
+                            break;
+                        case FILE_INGEST_PIPELINE_TYPE:
+                            pipelineConfig = fileIngestPipelineConfig;
+                            break;
+                        default:
+                            logger.log(Level.SEVERE, "Invalid pipelines config file");
+                            return;
+                    }
                 }
-                for (int moduleNum = 0; moduleNum < numModules; ++moduleNum) {
-                    Element moduleElement = (Element) modulesElems.item(moduleNum);
-                    final String moduleClassName = moduleElement.getAttribute(XML_MODULE_CLASS_NAME_ATTR);
-                    if (moduleClassName != null) {
-                        pipelineConfig.add(moduleClassName);
+
+                // Create an ordered list of class names. The sequence of class 
+                // names defines the sequence of modules in the pipeline.
+                if (pipelineConfig != null) {
+                    NodeList modulesElems = pipelineElement.getElementsByTagName(XML_MODULE_ELEM);
+                    int numModules = modulesElems.getLength();
+                    if (numModules == 0) {
+                        break;
+                    }
+                    for (int moduleNum = 0; moduleNum < numModules; ++moduleNum) {
+                        Element moduleElement = (Element) modulesElems.item(moduleNum);
+                        final String moduleClassName = moduleElement.getAttribute(XML_MODULE_CLASS_NAME_ATTR);
+                        if (moduleClassName != null) {
+                            pipelineConfig.add(moduleClassName);
+                        }
                     }
                 }
             }
+        } catch (IOException ex) {
+            logger.log(Level.SEVERE, "Error copying default pipeline configuration to user dir", ex);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml b/Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
index 9c931c27e3..542f168986 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
+++ b/Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
@@ -4,12 +4,12 @@ Contains only the core ingest modules that ship with Autopsy -->
 <PIPELINE_CONFIG>
     <PIPELINE type="FileAnalysis">
       <MODULE order="1" type="plugin" location="org.sleuthkit.autopsy.hashdatabase.HashDbIngestModule" arguments="" />
-      <MODULE order="2" type="plugin" location="org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule" arguments=""/>
-      <MODULE order="3" type="plugin" location="org.sleuthkit.autopsy.sevenzip.SevenZipIngestModule" arguments="" />
-      <MODULE order="4" type="plugin" location="org.sleuthkit.autopsy.exifparser.ExifParserFileIngestModule"/>
+      <MODULE order="2" type="plugin" location="org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdIngestModule" arguments=""/>
+      <MODULE order="3" type="plugin" location="org.sleuthkit.autopsy.modules.sevenzip.SevenZipIngestModule" arguments="" />
+      <MODULE order="4" type="plugin" location="org.sleuthkit.autopsy.modules.exifparser.ExifParserFileIngestModule"/>
       <MODULE order="5" type="plugin" location="org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule"/>
       <MODULE order="6" type="plugin" location="org.sleuthkit.autopsy.thunderbirdparser.ThunderbirdMboxFileIngestModule" arguments=""/>
-      <MODULE order="7" type="plugin" location="org.sleuthkit.autopsy.fileextmismatch.FileExtMismatchIngestModule" arguments=""/>
+      <MODULE order="7" type="plugin" location="org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchIngestModule" arguments=""/>
     </PIPELINE>
 
     <PIPELINE type="ImageAnalysis">
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties
similarity index 100%
rename from ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties
similarity index 100%
rename from ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
similarity index 86%
rename from ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java
rename to Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
index 58656cdc80..6e9f8c4ecf 100644
--- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.exifparser;
+package org.sleuthkit.autopsy.modules.exif;
 
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
@@ -32,13 +32,16 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -57,12 +60,21 @@ public final class ExifParserFileIngestModule extends IngestModuleAdapter implem
 
     private static final Logger logger = Logger.getLogger(ExifParserFileIngestModule.class.getName());
     private final IngestServices services = IngestServices.getInstance();
-    private int filesProcessed = 0;
-    private boolean filesToFire = false;
-
+    private AtomicInteger filesProcessed = new AtomicInteger(0);
+    private volatile boolean filesToFire = false;
+    private long jobId;
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
+        
     ExifParserFileIngestModule() {
     }
 
+    @Override
+    public void startUp(IngestJobContext context) throws IngestModuleException {    
+        jobId = context.getJobId();
+        refCounter.incrementAndGet(jobId);
+    }
+
+    
     @Override
     public ProcessResult process(AbstractFile content) {
         //skip unalloc
@@ -76,8 +88,8 @@ public final class ExifParserFileIngestModule extends IngestModuleAdapter implem
         }
 
         // update the tree every 1000 files if we have EXIF data that is not being being displayed 
-        filesProcessed++;
-        if ((filesToFire) && (filesProcessed % 1000 == 0)) {
+        final int filesProcessedValue = filesProcessed.incrementAndGet();
+        if ((filesToFire) && (filesProcessedValue % 1000 == 0)) {
             services.fireModuleDataEvent(new ModuleDataEvent(ExifParserModuleFactory.getModuleName(), BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF));
             filesToFire = false;
         }
@@ -187,9 +199,12 @@ public final class ExifParserFileIngestModule extends IngestModuleAdapter implem
 
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        if (filesToFire) {
-            //send the final new data event
-            services.fireModuleDataEvent(new ModuleDataEvent(ExifParserModuleFactory.getModuleName(), BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF));
+        // We only need to check for this final event on the last module per job
+        if (refCounter.decrementAndGet(jobId) == 0) {
+            if (filesToFire) {
+                //send the final new data event
+                services.fireModuleDataEvent(new ModuleDataEvent(ExifParserModuleFactory.getModuleName(), BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF));
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserModuleFactory.java
similarity index 97%
rename from ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java
rename to Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserModuleFactory.java
index 73078e67cb..8f1b1a4efe 100755
--- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserModuleFactory.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.exifparser;
+package org.sleuthkit.autopsy.modules.exif;
 
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.Version;
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/layer.xml b/Core/src/org/sleuthkit/autopsy/modules/exif/layer.xml
similarity index 100%
rename from ExifParser/src/org/sleuthkit/autopsy/exifparser/layer.xml
rename to Core/src/org/sleuthkit/autopsy/modules/exif/layer.xml
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/AddFileExtensionAction.java
similarity index 97%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/AddFileExtensionAction.java
index 463178e25e..7be2e30983 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/AddFileExtensionAction.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.openide.util.NbBundle;
 import java.awt.event.ActionEvent;
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
similarity index 97%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
index be85efacb9..c5610f46ad 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
@@ -34,7 +34,6 @@ FileExtMismatchIngestModule.complete.totalFiles=Total Files Processed
 FileExtMismatchIngestModule.complete.svcMsg.text=File Extension Mismatch Results
 FileExtMismatchOptionsPanelController.moduleErr=Module Error
 FileExtMismatchOptionsPanelController.moduleErr.msg=A module caused an error listening to FileExtMismatchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-FileExtMismatchModuleSettingsPanel.skipKnownFilesCheckbox.text=Skip known files (NSRL)
 FileExtMismatchModuleSettingsPanel.skipTextPlain.text=Skip text files
 FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=Skip files without extensions
 FileExtMismatchSettingsPanel.addTypeButton.text=Add Type
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
similarity index 100%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
similarity index 99%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
index 73907a04ac..b52140876f 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
similarity index 98%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
index 855c586870..645de2ba48 100755
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
similarity index 86%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
index 66d0ba9826..e01d1856f0 100755
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 
@@ -25,7 +25,6 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
  */
 final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings {
 
-    private boolean skipKnownFiles = false;
     private boolean skipFilesWithNoExtension = true;
     private boolean skipFilesWithTextPlainMimeType = false;
 
@@ -33,19 +32,10 @@ final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJ
     }
 
     FileExtMismatchDetectorModuleSettings(boolean skipKnownFiles, boolean skipFilesWithNoExtension, boolean skipFilesWithTextPlainMimeType) {
-        this.skipKnownFiles = skipKnownFiles;
         this.skipFilesWithNoExtension = skipFilesWithNoExtension;
         this.skipFilesWithTextPlainMimeType = skipFilesWithTextPlainMimeType;
     }
 
-    void setSkipKnownFiles(boolean enabled) {
-        skipKnownFiles = enabled;
-    }
-
-    boolean skipKnownFiles() {
-        return skipKnownFiles;
-    }
-
     void setSkipFilesWithNoExtension(boolean enabled) {
         skipFilesWithNoExtension = enabled;
     }
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
similarity index 76%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
index 417a47cb24..5745017a08 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -32,13 +33,13 @@ import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.TskData.FileKnown;
 import org.sleuthkit.datamodel.TskException;
 
 /**
@@ -47,12 +48,13 @@ import org.sleuthkit.datamodel.TskException;
 public class FileExtMismatchIngestModule extends IngestModuleAdapter implements FileIngestModule {
 
     private static final Logger logger = Logger.getLogger(FileExtMismatchIngestModule.class.getName());
-    private static int messageId = 0; // RJCTODO: This is not thread safe
     private final IngestServices services = IngestServices.getInstance();
     private final FileExtMismatchDetectorModuleSettings settings;
     private HashMap<String, String[]> SigTypeToExtMap = new HashMap<>();
-    private long processTime = 0;
-    private long numFiles = 0;
+    private long jobId;
+    private static AtomicLong processTime = new AtomicLong(0);
+    private static AtomicLong numFiles = new AtomicLong(0);
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
 
     FileExtMismatchIngestModule(FileExtMismatchDetectorModuleSettings settings) {
         this.settings = settings;
@@ -60,6 +62,8 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
 
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
+        jobId = context.getJobId();
+        refCounter.incrementAndGet(jobId);
         FileExtMismatchXML xmlLoader = FileExtMismatchXML.getDefault();
         SigTypeToExtMap = xmlLoader.load();
     }
@@ -78,17 +82,13 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
             return ProcessResult.OK;
         }
 
-        if (settings.skipKnownFiles() && (abstractFile.getKnown() == FileKnown.KNOWN)) {
-            return ProcessResult.OK;
-        }
-
         try {
             long startTime = System.currentTimeMillis();
 
             boolean mismatchDetected = compareSigTypeToExt(abstractFile);
 
-            processTime += (System.currentTimeMillis() - startTime);
-            numFiles++;
+            processTime.getAndAdd(System.currentTimeMillis() - startTime);
+            numFiles.getAndIncrement();
 
             if (mismatchDetected) {
                 // add artifact               
@@ -154,19 +154,22 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
 
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        StringBuilder detailsSb = new StringBuilder();
-        detailsSb.append("<table border='0' cellpadding='4' width='280'>");
-        detailsSb.append("<tr><td>").append(FileExtMismatchDetectorModuleFactory.getModuleName()).append("</td></tr>");
-        detailsSb.append("<tr><td>").append(
-                NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalProcTime"))
-                .append("</td><td>").append(processTime).append("</td></tr>\n");
-        detailsSb.append("<tr><td>").append(
-                NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalFiles"))
-                .append("</td><td>").append(numFiles).append("</td></tr>\n");
-        detailsSb.append("</table>");
-        services.postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, FileExtMismatchDetectorModuleFactory.getModuleName(),
-                NbBundle.getMessage(this.getClass(),
-                "FileExtMismatchIngestModule.complete.svcMsg.text"),
-                detailsSb.toString()));
+        // We only need to post the summary msg from the last module per job
+        if (refCounter.decrementAndGet(jobId) == 0) {       
+            StringBuilder detailsSb = new StringBuilder();
+            detailsSb.append("<table border='0' cellpadding='4' width='280'>");
+            detailsSb.append("<tr><td>").append(FileExtMismatchDetectorModuleFactory.getModuleName()).append("</td></tr>");
+            detailsSb.append("<tr><td>").append(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalProcTime"))
+                    .append("</td><td>").append(processTime.get()).append("</td></tr>\n");
+            detailsSb.append("<tr><td>").append(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalFiles"))
+                    .append("</td><td>").append(numFiles.get()).append("</td></tr>\n");
+            detailsSb.append("</table>");
+            services.postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileExtMismatchDetectorModuleFactory.getModuleName(),
+                    NbBundle.getMessage(this.getClass(),
+                    "FileExtMismatchIngestModule.complete.svcMsg.text"),
+                    detailsSb.toString()));
+        }
     }
 }
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.form
similarity index 67%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.form
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.form
index a2e7553626..be70dbe504 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.form
@@ -21,7 +21,6 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="skipTextPlain" min="-2" max="-2" attributes="0"/>
                   <Component id="skipNoExtCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="skipKnownFilesCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="0" pref="138" max="32767" attributes="0"/>
           </Group>
@@ -33,9 +32,7 @@
               <Component id="skipNoExtCheckBox" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="skipTextPlain" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="skipKnownFilesCheckbox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="28" max="32767" attributes="0"/>
+              <EmptySpace pref="51" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -45,7 +42,7 @@
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -55,7 +52,7 @@
     <Component class="javax.swing.JCheckBox" name="skipTextPlain">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipTextPlain.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipTextPlain.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -65,15 +62,5 @@
         <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="skipTextPlain.setSelected(true);"/>
       </AuxValues>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="skipKnownFilesCheckbox">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipKnownFilesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="skipKnownFilesCheckboxActionPerformed"/>
-      </Events>
-    </Component>
   </SubComponents>
 </Form>
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
similarity index 78%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
index 5dc0c5321d..de619e3510 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
@@ -38,7 +38,6 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
     private void customizeComponents() {
         skipNoExtCheckBox.setSelected(settings.skipFilesWithNoExtension());
         skipTextPlain.setSelected(settings.skipFilesWithTextPlainMimeType());
-        skipKnownFilesCheckbox.setSelected(settings.skipKnownFiles());
     }
 
     @Override
@@ -57,7 +56,6 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
 
         skipNoExtCheckBox = new javax.swing.JCheckBox();
         skipTextPlain = new javax.swing.JCheckBox();
-        skipKnownFilesCheckbox = new javax.swing.JCheckBox();
 
         skipNoExtCheckBox.setSelected(true);
         skipNoExtCheckBox.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchModuleSettingsPanel.class, "FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text")); // NOI18N
@@ -75,13 +73,6 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
             }
         });
 
-        skipKnownFilesCheckbox.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchModuleSettingsPanel.class, "FileExtMismatchModuleSettingsPanel.skipKnownFilesCheckbox.text")); // NOI18N
-        skipKnownFilesCheckbox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                skipKnownFilesCheckboxActionPerformed(evt);
-            }
-        });
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -90,8 +81,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(skipTextPlain)
-                    .addComponent(skipNoExtCheckBox)
-                    .addComponent(skipKnownFilesCheckbox))
+                    .addComponent(skipNoExtCheckBox))
                 .addGap(0, 138, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -100,9 +90,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
                 .addComponent(skipNoExtCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(skipTextPlain)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(skipKnownFilesCheckbox)
-                .addContainerGap(28, Short.MAX_VALUE))
+                .addContainerGap(51, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -114,12 +102,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
         settings.setSkipFilesWithTextPlainMimeType(skipTextPlain.isSelected());
     }//GEN-LAST:event_skipTextPlainActionPerformed
 
-    private void skipKnownFilesCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipKnownFilesCheckboxActionPerformed
-        settings.setSkipKnownFiles(skipKnownFilesCheckbox.isSelected());
-    }//GEN-LAST:event_skipKnownFilesCheckboxActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JCheckBox skipKnownFilesCheckbox;
     private javax.swing.JCheckBox skipNoExtCheckBox;
     private javax.swing.JCheckBox skipTextPlain;
     // End of variables declaration//GEN-END:variables
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchOptionsPanelController.java
similarity index 96%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchOptionsPanelController.java
index ba4f85d0b5..35749a810e 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchOptionsPanelController.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -17,7 +17,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
 @OptionsPanelController.TopLevelRegistration(
         categoryName = "#OptionsCategory_Name_FileExtMismatchOptions",
-        iconBase = "org/sleuthkit/autopsy/fileextmismatch/options-icon.png",
+        iconBase = "org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png",
         position = 4,
         keywords = "#OptionsCategory_FileExtMismatch",
         keywordsCategory = "KeywordSearchOptions")
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
similarity index 87%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.form
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
index 299bacab53..dc2898697c 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form
@@ -50,10 +50,10 @@
     <Component class="javax.swing.JButton" name="saveButton">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/org/sleuthkit/autopsy/fileextmismatch/save16.png"/>
+          <Image iconType="3" name="/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="enabled" type="boolean" value="false"/>
       </Properties>
@@ -128,7 +128,7 @@
             <Component class="javax.swing.JLabel" name="jLabel1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -148,7 +148,7 @@
             <Component class="javax.swing.JTextField" name="userTypeTextField">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userTypeTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userTypeTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -158,7 +158,7 @@
             <Component class="javax.swing.JButton" name="addTypeButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -168,7 +168,7 @@
             <Component class="javax.swing.JButton" name="removeTypeButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -181,14 +181,14 @@
                   <Color blue="0" green="0" red="ff" type="rgb"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="mimeRemoveErrLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -254,7 +254,7 @@
             <Component class="javax.swing.JTextField" name="userExtTextField">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userExtTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userExtTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -264,7 +264,7 @@
             <Component class="javax.swing.JButton" name="addExtButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -287,7 +287,7 @@
             <Component class="javax.swing.JButton" name="removeExtButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -297,7 +297,7 @@
             <Component class="javax.swing.JLabel" name="extHeaderLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extHeaderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extHeaderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -307,14 +307,14 @@
                   <Color blue="0" green="0" red="ff" type="rgb"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extErrorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extErrorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="extRemoveErrLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -328,7 +328,7 @@
           <Color blue="ff" green="0" red="0" type="rgb"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveMsgLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveMsgLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
similarity index 99%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
index 98d701cbca..ee76aa4095 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -32,7 +32,7 @@ import javax.swing.table.AbstractTableModel;
 import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule;
+import org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdIngestModule;
 import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
 
 /**
@@ -154,7 +154,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSetttingsPane
         extRemoveErrLabel = new javax.swing.JLabel();
         saveMsgLabel = new javax.swing.JLabel();
 
-        saveButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/fileextmismatch/save16.png"))); // NOI18N
+        saveButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png"))); // NOI18N
         saveButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.saveButton.text")); // NOI18N
         saveButton.setEnabled(false);
         saveButton.addActionListener(new java.awt.event.ActionListener() {
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
similarity index 98%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
index 8fe9e84a89..d90802a69b 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchXML.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,7 +61,7 @@ class FileExtMismatchXML {
         this.filePath = filePath;
                
         try {
-            boolean extracted = PlatformUtil.extractResourceToUserConfigDir(FileExtMismatchXML.class, DEFAULT_CONFIG_FILE_NAME);
+            boolean extracted = PlatformUtil.extractResourceToUserConfigDir(FileExtMismatchXML.class, DEFAULT_CONFIG_FILE_NAME, false);
         } catch (IOException ex) {
             logger.log(Level.SEVERE, "Error copying default mismatch configuration to user dir ", ex);
         }        
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/MismatchConfigSchema.xsd b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/MismatchConfigSchema.xsd
similarity index 100%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/MismatchConfigSchema.xsd
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/MismatchConfigSchema.xsd
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/mismatch_config.xml
similarity index 100%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/mismatch_config.xml
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/options-icon.png b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png
similarity index 100%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/options-icon.png
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/save16.png b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png
similarity index 100%
rename from FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/save16.png
rename to Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties
similarity index 100%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
similarity index 100%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
similarity index 96%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
index 50331c3a88..d748578f91 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeDetectionInterface.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetectionInterface.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.datamodel.AbstractFile;
 
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
similarity index 68%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
index 135f6899a9..0ba451f716 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -34,6 +35,7 @@ import org.sleuthkit.datamodel.TskData.FileKnown;
 import org.sleuthkit.datamodel.TskException;
 import org.sleuthkit.autopsy.ingest.IngestModule.ProcessResult;
 import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 
 /**
  * Detects the type of a file based on signature (magic) values. Posts results
@@ -44,9 +46,11 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
     private static final Logger logger = Logger.getLogger(FileTypeIdIngestModule.class.getName());
     private static final long MIN_FILE_SIZE = 512;
     private final FileTypeIdModuleSettings settings;
-    private long matchTime = 0;
-    private int messageId = 0; // RJCTODO: If this is not made a thread safe static, duplicate message ids will be used 
-    private long numFiles = 0;
+    private long jobId;  
+    private static AtomicLong matchTime = new AtomicLong(0);
+    private static AtomicLong numFiles = new AtomicLong(0);
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
+
     // The detector. Swap out with a different implementation of FileTypeDetectionInterface as needed.
     // If desired in the future to be more knowledgable about weird files or rare formats, we could 
     // actually have a list of detectors which are called in order until a match is found.
@@ -56,6 +60,12 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
         this.settings = settings;
     }
 
+    @Override
+    public void startUp(IngestJobContext context) throws IngestModuleException {
+        jobId = context.getJobId();
+        refCounter.incrementAndGet(jobId);
+    }    
+    
     @Override
     public ProcessResult process(AbstractFile abstractFile) {
         // skip non-files
@@ -76,8 +86,8 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
         try {
             long startTime = System.currentTimeMillis();
             FileTypeDetectionInterface.FileIdInfo fileId = detector.attemptMatch(abstractFile);
-            matchTime += (System.currentTimeMillis() - startTime);
-            numFiles++;
+            matchTime.getAndAdd(System.currentTimeMillis() - startTime);
+            numFiles.getAndIncrement();
 
             if (!fileId.type.isEmpty()) {
                 // add artifact
@@ -99,22 +109,25 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
 
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        StringBuilder detailsSb = new StringBuilder();
-        detailsSb.append("<table border='0' cellpadding='4' width='280'>");
-        detailsSb.append("<tr><td>").append(FileTypeIdModuleFactory.getModuleName()).append("</td></tr>");
-        detailsSb.append("<tr><td>")
-                .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalProcTime"))
-                .append("</td><td>").append(matchTime).append("</td></tr>\n");
-        detailsSb.append("<tr><td>")
-                .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalFiles"))
-                .append("</td><td>").append(numFiles).append("</td></tr>\n");
-        detailsSb.append("</table>");
-        IngestServices.getInstance().postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, FileTypeIdModuleFactory.getModuleName(),
-                NbBundle.getMessage(this.getClass(),
-                "FileTypeIdIngestModule.complete.srvMsg.text"),
-                detailsSb.toString()));
+        // We only need to post the summary msg from the last module per job
+        if (refCounter.decrementAndGet(jobId) == 0) {
+            StringBuilder detailsSb = new StringBuilder();
+            detailsSb.append("<table border='0' cellpadding='4' width='280'>");
+            detailsSb.append("<tr><td>").append(FileTypeIdModuleFactory.getModuleName()).append("</td></tr>");
+            detailsSb.append("<tr><td>")
+                    .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalProcTime"))
+                    .append("</td><td>").append(matchTime.get()).append("</td></tr>\n");
+            detailsSb.append("<tr><td>")
+                    .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalFiles"))
+                    .append("</td><td>").append(numFiles.get()).append("</td></tr>\n");
+            detailsSb.append("</table>");
+            IngestServices.getInstance().postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileTypeIdModuleFactory.getModuleName(),
+                    NbBundle.getMessage(this.getClass(),
+                    "FileTypeIdIngestModule.complete.srvMsg.text"),
+                    detailsSb.toString()));
+        }
     }
-
+    
     /**
      * Validate if a given mime type is in the detector's registry.
      *
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
similarity index 98%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
index 36004c26e0..0e041f116e 100755
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
similarity index 96%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
index cd2bc4bc12..3dbb50c8a9 100755
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.form
similarity index 78%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.form
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.form
index da4b241fb4..6a81b507d5 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.form
@@ -38,13 +38,13 @@
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.java
similarity index 98%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.java
index 442e2b990e..b6f9b75c15 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettingsPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
similarity index 95%
rename from FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java
rename to Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
index e074e0f003..06794331c7 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/TikaFileTypeDetector.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import java.util.SortedSet;
 import org.apache.tika.Tika;
@@ -35,7 +35,8 @@ class TikaFileTypeDetector implements FileTypeDetectionInterface {
             FileTypeDetectionInterface.FileIdInfo ret = new FileTypeDetectionInterface.FileIdInfo();
             final int maxBytesInitial = 100; //how many bytes to read on first pass
             byte buffer[] = new byte[maxBytesInitial];
-
+            int len = abstractFile.read(buffer, 0, maxBytesInitial);
+            
             boolean found = false;
             try {
                 // the xml detection in Tika tries to parse the entire file and throws exceptions
@@ -49,7 +50,7 @@ class TikaFileTypeDetector implements FileTypeDetectionInterface {
                 }
                 catch (IndexOutOfBoundsException e) {
                     // do nothing
-                }
+                } 
                 
                 if (found == false) {
                     String mimetype = tikaInst.detect(buffer);
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/ArchiveFileExtractorModuleFactory.java
similarity index 97%
rename from SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java
rename to Core/src/org/sleuthkit/autopsy/modules/sevenzip/ArchiveFileExtractorModuleFactory.java
index 7bc38efd53..c78eeb2013 100755
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/ArchiveFileExtractorModuleFactory.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/Bundle.properties
similarity index 100%
rename from SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/modules/sevenzip/Bundle.properties
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/Bundle_ja.properties
similarity index 100%
rename from SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/modules/sevenzip/Bundle_ja.properties
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipContentReadStream.java
similarity index 98%
rename from SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java
rename to Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipContentReadStream.java
index 9e180e7829..2b7cd375c9 100644
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipContentReadStream.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipIngestModule.java
similarity index 94%
rename from SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java
rename to Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipIngestModule.java
index b5778984bf..da517d7b39 100644
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipIngestModule.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -60,6 +60,7 @@ import org.sleuthkit.autopsy.ingest.IngestModule.ProcessResult;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 
 /**
  * 7Zip ingest module extracts supported archives, adds extracted DerivedFiles,
@@ -69,7 +70,6 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
 
     private static final Logger logger = Logger.getLogger(SevenZipIngestModule.class.getName());
     private IngestServices services = IngestServices.getInstance();
-    private volatile int messageID = 0; // RJCTODO: This is not actually thread safe
     static final String[] SUPPORTED_EXTENSIONS = {"zip", "rar", "arj", "7z", "7zip", "gzip", "gz", "bzip2", "tar", "tgz",}; // "iso"};
     private String unpackDir; //relative to the case, to store in db
     private String unpackDirPath; //absolute, to extract to
@@ -91,6 +91,8 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
     private final byte[] fileHeaderBuffer = new byte[readHeaderSize];
     private static final int ZIP_SIGNATURE_BE = 0x504B0304;
     private IngestJobContext context;
+    private long jobId;
+    private final static IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
 
     SevenZipIngestModule() {
     }
@@ -98,6 +100,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
+        jobId = context.getJobId();
 
         final Case currentCase = Case.getCurrentCase();
 
@@ -117,25 +120,28 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
                 String details = NbBundle.getMessage(this.getClass(),
                         "SevenZipIngestModule.init.errInitModule.details",
                         unpackDirPath, e.getMessage());
-                services.postMessage(IngestMessage.createErrorMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+                services.postMessage(IngestMessage.createErrorMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
                 throw e;
             }
         }
 
-        try {
-            SevenZip.initSevenZipFromPlatformJAR();
-            String platform = SevenZip.getUsedPlatform();
-            logger.log(Level.INFO, "7-Zip-JBinding library was initialized on supported platform: {0}", platform);
-        } catch (SevenZipNativeInitializationException e) {
-            logger.log(Level.SEVERE, "Error initializing 7-Zip-JBinding library", e);
-            String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errInitModule.msg",
-                    ArchiveFileExtractorModuleFactory.getModuleName());
-            String details = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errCantInitLib",
-                    e.getMessage());
-            services.postMessage(IngestMessage.createErrorMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
-            throw new RuntimeException(e);
+        // if first instance of this module for this job then check 7zip init
+        if (refCounter.incrementAndGet(jobId) == 1) {
+            try {
+                SevenZip.initSevenZipFromPlatformJAR();
+                String platform = SevenZip.getUsedPlatform();
+                logger.log(Level.INFO, "7-Zip-JBinding library was initialized on supported platform: {0}", platform);
+            } catch (SevenZipNativeInitializationException e) {
+                logger.log(Level.SEVERE, "Error initializing 7-Zip-JBinding library", e);
+                String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errInitModule.msg",
+                        ArchiveFileExtractorModuleFactory.getModuleName());
+                String details = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errCantInitLib",
+                        e.getMessage());
+                services.postMessage(IngestMessage.createErrorMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+                throw new RuntimeException(e);
+            }
         }
-
+        
         archiveDepthCountTree = new ArchiveDepthCountTree();
     }
 
@@ -180,6 +186,12 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
         return ProcessResult.OK;
     }
 
+    @Override
+    public void shutDown(boolean ingestJobCancelled) {
+        // We don't need the value, but for cleanliness and consistency, -- it
+        refCounter.decrementAndGet(jobId);
+    }
+        
     private void sendNewFilesEvent(AbstractFile archive, List<AbstractFile> unpackedFiles) {
         //currently sending a single event for all new files
         services.fireModuleContentEvent(new ModuleContentEvent(archive));
@@ -242,7 +254,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
                 String details = NbBundle.getMessage(this.getClass(),
                         "SevenZipIngestModule.isZipBombCheck.warnDetails", cRatio);
                 //MessageNotifyUtil.Notify.error(msg, details);
-                services.postMessage(IngestMessage.createWarningMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+                services.postMessage(IngestMessage.createWarningMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
                 return true;
             } else {
                 return false;
@@ -276,7 +288,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
                     "SevenZipIngestModule.unpack.warnDetails.zipBomb",
                     parentAr.getDepth());
             //MessageNotifyUtil.Notify.error(msg, details);
-            services.postMessage(IngestMessage.createWarningMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+            services.postMessage(IngestMessage.createWarningMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
             return unpackedFiles;
         }
 
@@ -403,7 +415,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
                         String details = NbBundle.getMessage(this.getClass(),
                                 "SevenZipIngestModule.unpack.notEnoughDiskSpace.details");
                         //MessageNotifyUtil.Notify.error(msg, details);
-                        services.postMessage(IngestMessage.createErrorMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+                        services.postMessage(IngestMessage.createErrorMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
                         logger.log(Level.INFO, "Skipping archive item due not sufficient disk space for this item: {0}, {1}", new Object[]{archiveFile.getName(), fileName});
                         continue; //skip this file
                     } else {
@@ -501,7 +513,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
                 String details = NbBundle.getMessage(this.getClass(),
                         "SevenZipIngestModule.unpack.errUnpacking.details",
                         fullName, ex.getMessage());
-                services.postMessage(IngestMessage.createErrorMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+                services.postMessage(IngestMessage.createErrorMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
             }
         } finally {
             if (inArchive != null) {
@@ -541,7 +553,7 @@ public final class SevenZipIngestModule extends IngestModuleAdapter implements F
             String details = NbBundle.getMessage(this.getClass(),
                     "SevenZipIngestModule.unpack.encrFileDetected.details",
                     archiveFile.getName(), ArchiveFileExtractorModuleFactory.getModuleName());
-            services.postMessage(IngestMessage.createWarningMessage(++messageID, ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
+            services.postMessage(IngestMessage.createWarningMessage(ArchiveFileExtractorModuleFactory.getModuleName(), msg, details));
         }
 
         return unpackedFiles;
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index 5ef11a4a2a..f3d0b5dbb2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -47,6 +47,13 @@ ReportBodyFile.progress.processing=Now processing {0}...
 ReportBodyFile.getName.text=TSK Body File
 ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
 ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportKML.progress.querying=Querying files...
+ReportKML.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportKML.progress.loading=Loading files...
+ReportKML.progress.processing=Now processing {0}...
+ReportKML.getName.text=Google Earth/KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml
 ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
 ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
 ReportExcel.numAartifacts.text=Number of artifacts\:
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
new file mode 100644
index 0000000000..05cbb3b6a7
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
@@ -0,0 +1,318 @@
+/*
+ *
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2014 Basis Technology Corp.
+ * contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.report;
+
+import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.*;
+import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.Level;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+import org.apache.commons.lang.StringEscapeUtils;
+
+/**
+ * Generates a KML file based on geo coordinates store in blackboard.
+ */
+class ReportKML implements GeneralReportModule {
+
+    private static final Logger logger = Logger.getLogger(ReportKML.class.getName());
+    private static ReportKML instance = null;
+    private Case currentCase;
+    private SleuthkitCase skCase;
+    private String reportPath;
+
+    // Hidden constructor for the report
+    private ReportKML() {
+    }
+
+    // Get the default implementation of this report
+    public static synchronized ReportKML getDefault() {
+        if (instance == null) {
+            instance = new ReportKML();
+        }
+        return instance;
+    }
+
+    /**
+     * Generates a body file format report for use with the MAC time tool.
+     *
+     * @param path path to save the report
+     * @param progressPanel panel to update the report's progress
+     */
+    @Override
+    public void generateReport(String path, ReportProgressPanel progressPanel) {
+
+        // Start the progress bar and setup the report
+        progressPanel.setIndeterminate(false);
+        progressPanel.start();
+        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportKML.progress.querying"));
+        reportPath = path + "ReportKML.kml";
+        String reportPath2 = path + "ReportKML.txt";
+        currentCase = Case.getCurrentCase();
+        skCase = currentCase.getSleuthkitCase();
+
+        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportKML.progress.loading"));
+        // Check if ingest has finished
+        String ingestwarning = "";
+        if (IngestManager.getInstance().isIngestRunning()) {
+            ingestwarning = NbBundle.getMessage(this.getClass(), "ReportBodyFile.ingestWarning.text");
+        }
+        progressPanel.setMaximumProgress(5);
+        progressPanel.increment();
+
+
+        try {
+
+            BufferedWriter out = null;
+            try {
+                out = new BufferedWriter(new FileWriter(reportPath2));
+
+                double lat = 0; // temp latitude
+                double lon = 0; //temp longitude
+                AbstractFile aFile;
+                String geoPath = ""; // will hold values of images to put in kml
+                String imageName = "";
+
+
+                File f;
+                for (BlackboardArtifact artifact : skCase.getBlackboardArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF)) {
+                    lat = 0;
+                    lon = 0;
+                    geoPath = "";
+                    String extractedToPath;
+                    for (BlackboardAttribute attribute : artifact.getAttributes()) {
+                        if (attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LATITUDE.getTypeID()) //latitude
+                        {
+
+                            lat = attribute.getValueDouble();
+                        }
+                        if (attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE.getTypeID()) //longitude
+                        {
+                            lon = attribute.getValueDouble();
+                        }
+                    }
+                    if (lon != 0 && lat != 0) {
+                        aFile = artifact.getSleuthkitCase().getAbstractFileById(artifact.getObjectID());
+
+                        extractedToPath = reportPath + aFile.getName();
+                        geoPath = extractedToPath;
+                        f = new File(extractedToPath);
+                        f.createNewFile();
+                        copyFileUsingStream(aFile, f);
+                        imageName = aFile.getName();
+                        out.write(String.valueOf(lat));
+                        out.write(";");
+                        out.write(String.valueOf(lon));
+                        out.write(";");
+                        out.write(String.valueOf(geoPath));
+                        out.write(";");
+                        out.write(String.valueOf(imageName));
+                        out.write("\n");
+                        // lat lon path name
+                    }
+                }
+                out.flush();
+                out.close();
+                progressPanel.increment();
+                /*
+                 * Step 1: generate XML stub
+                 */
+                Namespace ns = Namespace.getNamespace("", "http://earth.google.com/kml/2.2");
+                // kml
+                Element kml = new Element("kml", ns);
+                Document kmlDocument = new Document(kml);
+
+                // Document
+                Element document = new Element("Document", ns);
+                kml.addContent(document);
+
+                // name
+                Element name = new Element("name", ns);
+                name.setText("Java Generated KML Document");
+                document.addContent(name);
+
+                /*
+                 * Step 2: add in Style elements
+                 */
+
+                // Style
+                Element style = new Element("Style", ns);
+                style.setAttribute("id", "redIcon");
+                document.addContent(style);
+
+                // IconStyle
+                Element iconStyle = new Element("IconStyle", ns);
+                style.addContent(iconStyle);
+
+                // color
+                Element color = new Element("color", ns);
+                color.setText("990000ff");
+                iconStyle.addContent(color);
+
+                // Icon
+                Element icon = new Element("Icon", ns);
+                iconStyle.addContent(icon);
+
+                // href
+                Element href = new Element("href", ns);
+                href.setText("http://www.cs.mun.ca/~hoeber/teaching/cs4767/notes/02.1-kml/circle.png");
+                icon.addContent(href);
+                progressPanel.increment();
+                /*
+                 * Step 3: read data from source location and
+                 * add in a Placemark for each data element
+                 */
+
+                File file = new File(reportPath2);
+                BufferedReader reader;
+
+                reader = new BufferedReader(new FileReader(file));
+
+                String line = reader.readLine();
+                while (line != null) {
+                    String[] lineParts = line.split(";");
+                    if (lineParts.length == 4) {
+                        String coordinates = lineParts[1].trim() + "," + lineParts[0].trim(); //lat,lon
+                        // Placemark
+                        Element placemark = new Element("Placemark", ns);
+                        document.addContent(placemark);
+
+                        // name
+                        Element pmName = new Element("name", ns);
+                        pmName.setText(lineParts[3].trim());
+                        placemark.addContent(pmName);
+
+                        // Path
+                        Element pmPath = new Element("Path", ns);
+                        pmPath.setText(lineParts[2].trim());
+                        placemark.addContent(pmPath);
+
+                        // description
+                        Element pmDescription = new Element("description", ns);
+                        String xml = "<![CDATA[  \n" + " <img src='file:///" + lineParts[2].trim() + "' width='400' /><br/&gt;  \n";
+                        StringEscapeUtils.unescapeXml(xml);
+                        pmDescription.setText(xml);
+                        placemark.addContent(pmDescription);
+
+                        // styleUrl
+                        Element pmStyleUrl = new Element("styleUrl", ns);
+                        pmStyleUrl.setText("#redIcon");
+                        placemark.addContent(pmStyleUrl);
+
+                        // Point
+                        Element pmPoint = new Element("Point", ns);
+                        placemark.addContent(pmPoint);
+
+                        // coordinates
+                        Element pmCoordinates = new Element("coordinates", ns);
+
+                        pmCoordinates.setText(coordinates);
+                        pmPoint.addContent(pmCoordinates);
+
+                    }
+                    // read the next line
+                    line = reader.readLine();
+                }
+                progressPanel.increment();
+                /*
+                 * Step 4: write the XML file
+                 */
+                try {
+                    XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
+                    FileOutputStream writer = new FileOutputStream(reportPath);
+                    outputter.output(kmlDocument, writer);
+                    writer.close();
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, "Could not write the KML file.", ex);
+                }
+
+
+            } catch (IOException ex) {
+                logger.log(Level.WARNING, "Could not write the KML report.", ex);
+            }
+            progressPanel.complete();
+        } catch (TskCoreException ex) {
+            logger.log(Level.WARNING, "Failed to get the unique path.", ex);
+        }
+        progressPanel.increment();
+        progressPanel.complete();
+    }
+
+    public static void copyFileUsingStream(AbstractFile file, File jFile) throws IOException {
+        InputStream is = new ReadContentInputStream(file);
+        OutputStream os = new FileOutputStream(jFile);
+        byte[] buffer = new byte[8192];
+        int length;
+        try {
+            while ((length = is.read(buffer)) != -1) {
+                os.write(buffer, 0, length);
+            }
+
+        } finally {
+            is.close();
+            os.close();
+        }
+    }
+
+    @Override
+    public String getName() {
+        String name = NbBundle.getMessage(this.getClass(), "ReportKML.getName.text");
+        return name;
+    }
+
+    @Override
+    public String getFilePath() {
+        return NbBundle.getMessage(this.getClass(), "ReportKML.getFilePath.text");
+    }
+
+    @Override
+    public String getExtension() {
+        String ext = ".txt";
+        return ext;
+    }
+
+    @Override
+    public String getDescription() {
+        String desc = NbBundle.getMessage(this.getClass(), "ReportKML.getDesc.text");
+        return desc;
+    }
+
+    @Override
+    public JPanel getConfigurationPanel() {
+        return null; // No configuration panel
+    }
+}
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
rename to Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
rename to Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form b/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form
rename to Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java b/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java
rename to Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form b/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
rename to Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java b/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
rename to Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/layer.xml b/Core/src/org/sleuthkit/autopsy/timeline/layer.xml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/layer.xml
rename to Core/src/org/sleuthkit/autopsy/timeline/layer.xml
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml b/Core/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml
rename to Core/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml
diff --git a/ExifParser/build.xml b/ExifParser/build.xml
deleted file mode 100644
index beb3f50cb0..0000000000
--- a/ExifParser/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.exifparser" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.exifextract.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
\ No newline at end of file
diff --git a/ExifParser/manifest.mf b/ExifParser/manifest.mf
deleted file mode 100644
index 40668bc3a3..0000000000
--- a/ExifParser/manifest.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
-OpenIDE-Module-Implementation-Version: 10
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
diff --git a/ExifParser/nbproject/build-impl.xml b/ExifParser/nbproject/build-impl.xml
deleted file mode 100644
index e1bcfa276c..0000000000
--- a/ExifParser/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.exifextract-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
\ No newline at end of file
diff --git a/ExifParser/nbproject/project.properties b/ExifParser/nbproject/project.properties
deleted file mode 100644
index f278b6de1b..0000000000
--- a/ExifParser/nbproject/project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
-nbm.needs.restart=true
-spec.version.base=1.1
diff --git a/ExifParser/nbproject/project.xml b/ExifParser/nbproject/project.xml
deleted file mode 100644
index 88405985e9..0000000000
--- a/ExifParser/nbproject/project.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.exifparser</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmpcore.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmpcore.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/metadata-extractor-2.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/metadata-extractor-2.6.2.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/ExifParser/nbproject/suite.properties b/ExifParser/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6..0000000000
--- a/ExifParser/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/FileExtMismatch/build.xml b/FileExtMismatch/build.xml
deleted file mode 100644
index 90f199456e..0000000000
--- a/FileExtMismatch/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.fileextmismatch" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.fileextmismatch.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/FileExtMismatch/manifest.mf b/FileExtMismatch/manifest.mf
deleted file mode 100644
index c1678923ea..0000000000
--- a/FileExtMismatch/manifest.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.fileextmismatch/3
-OpenIDE-Module-Implementation-Version: 1
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
-
diff --git a/FileExtMismatch/nbproject/build-impl.xml b/FileExtMismatch/nbproject/build-impl.xml
deleted file mode 100644
index 40c37cb50f..0000000000
--- a/FileExtMismatch/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.fileextmismatch-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/FileExtMismatch/nbproject/platform.properties b/FileExtMismatch/nbproject/platform.properties
deleted file mode 100644
index a9fa87f749..0000000000
--- a/FileExtMismatch/nbproject/platform.properties
+++ /dev/null
@@ -1,120 +0,0 @@
-branding.token=autopsy
-netbeans-plat-version=7.3.1
-suite.dir=${basedir}
-nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
-harness.dir=${nbplatform.active.dir}/harness
-bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.lib.nbjavac,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.kit,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.debugger.jpda.visual,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.form.nb,\
-    org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.declarative,\
-    org.netbeans.modules.java.hints.declarative.test,\
-    org.netbeans.modules.java.hints.legacy.spi,\
-    org.netbeans.modules.java.hints.test,\
-    org.netbeans.modules.java.hints.ui,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.source.queries,\
-    org.netbeans.modules.java.source.queriesimpl,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.checkstyle,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.refactoring,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.netbeans.spi.java.hints
-
diff --git a/FileExtMismatch/nbproject/project.properties b/FileExtMismatch/nbproject/project.properties
deleted file mode 100644
index 21d3761899..0000000000
--- a/FileExtMismatch/nbproject/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.3
diff --git a/FileExtMismatch/nbproject/project.xml b/FileExtMismatch/nbproject/project.xml
deleted file mode 100644
index 23fa0b7529..0000000000
--- a/FileExtMismatch/nbproject/project.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.fileextmismatch</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.55.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.50.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.33.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.60.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.filetypeid</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.fileextmismatch</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git a/FileExtMismatch/nbproject/suite.properties b/FileExtMismatch/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6..0000000000
--- a/FileExtMismatch/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/FileTypeId/build.xml b/FileTypeId/build.xml
deleted file mode 100644
index 9771a82a0b..0000000000
--- a/FileTypeId/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.filetypeid" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.filetypeid.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/FileTypeId/manifest.mf b/FileTypeId/manifest.mf
deleted file mode 100644
index eac3c30420..0000000000
--- a/FileTypeId/manifest.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.filetypeid
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/filetypeid/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
diff --git a/FileTypeId/nbproject/build-impl.xml b/FileTypeId/nbproject/build-impl.xml
deleted file mode 100644
index ec094e8ceb..0000000000
--- a/FileTypeId/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.filetypeid-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/FileTypeId/nbproject/platform.properties b/FileTypeId/nbproject/platform.properties
deleted file mode 100644
index a9fa87f749..0000000000
--- a/FileTypeId/nbproject/platform.properties
+++ /dev/null
@@ -1,120 +0,0 @@
-branding.token=autopsy
-netbeans-plat-version=7.3.1
-suite.dir=${basedir}
-nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
-harness.dir=${nbplatform.active.dir}/harness
-bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.lib.nbjavac,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.kit,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.debugger.jpda.visual,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.form.nb,\
-    org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.declarative,\
-    org.netbeans.modules.java.hints.declarative.test,\
-    org.netbeans.modules.java.hints.legacy.spi,\
-    org.netbeans.modules.java.hints.test,\
-    org.netbeans.modules.java.hints.ui,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.source.queries,\
-    org.netbeans.modules.java.source.queriesimpl,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.checkstyle,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.refactoring,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.netbeans.spi.java.hints
-
diff --git a/FileTypeId/nbproject/project.properties b/FileTypeId/nbproject/project.properties
deleted file mode 100644
index 2dfc44febe..0000000000
--- a/FileTypeId/nbproject/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-file.reference.tika-core-1.2.jar=release/modules/ext/tika-core-1.2.jar
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/FileTypeId/nbproject/project.xml b/FileTypeId/nbproject/project.xml
deleted file mode 100644
index 8d3ea957d3..0000000000
--- a/FileTypeId/nbproject/project.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.filetypeid</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.55.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.33.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.60.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.filetypeid</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/tika-core-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/tika-core-1.2.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/FileTypeId/nbproject/suite.properties b/FileTypeId/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6..0000000000
--- a/FileTypeId/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/FileTypeId/src-alt/JMimeMagicFileTypeDetector.java b/FileTypeId/src-alt/JMimeMagicFileTypeDetector.java
deleted file mode 100644
index 246fadc81e..0000000000
--- a/FileTypeId/src-alt/JMimeMagicFileTypeDetector.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 - 2013 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.sleuthkit.autopsy.filetypeid;
-
-import org.sleuthkit.datamodel.AbstractFile;
-import net.sf.jmimemagic.Magic;
-import net.sf.jmimemagic.MagicMatch;
-import net.sf.jmimemagic.MagicMatchNotFoundException;
-import org.openide.util.Exceptions;
-
-/**
- *
- */
-public class JMimeMagicFileTypeDetector implements FileTypeDetectionInterface {
-
-    @Override
-    public FileIdInfo attemptMatch(AbstractFile abstractFile) {
-        try {        
-            FileIdInfo ret = new FileIdInfo();
-            final int maxBytesInitial = 3000; //how many bytes to read on first pass
-            byte buffer[] = new byte[maxBytesInitial];
-            ///@todo decide to use max bytes or give the whole file
-            int len = abstractFile.read(buffer, 0, maxBytesInitial);        
-            
-            try {
-                MagicMatch match = Magic.getMagicMatch(buffer);
-                if (match != null) {
-                    String matchStr = match.getMimeType();
-                    if (matchStr.equals("???")) {
-                        String desc = match.getDescription();
-                        if (!desc.isEmpty()) {
-                            ret.type = desc;
-                        }
-                    } else {
-                        ret.type = matchStr;
-                    }
-                    ret.extension = match.getExtension();
-                }
-            } catch (MagicMatchNotFoundException ex) {
-                //do nothing
-            }
-
-            return ret;
-
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return new FileIdInfo();
-        }        
-    }
-
-}
diff --git a/FileTypeId/src-alt/MimeUtilFileTypeDetector.java b/FileTypeId/src-alt/MimeUtilFileTypeDetector.java
deleted file mode 100644
index 40d5a74b58..0000000000
--- a/FileTypeId/src-alt/MimeUtilFileTypeDetector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 - 2013 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.sleuthkit.autopsy.filetypeid;
-
-import eu.medsea.mimeutil.MimeException;
-import eu.medsea.mimeutil.MimeType;
-import eu.medsea.mimeutil.detector.MagicMimeMimeDetector;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import org.openide.util.Exceptions;
-import org.sleuthkit.datamodel.AbstractFile;
-
-/**
- *
- */
-public class MimeUtilFileTypeDetector implements FileTypeDetectionInterface {
-    private static MagicMimeMimeDetector mimeUtil = new MagicMimeMimeDetector();
-    
-    
-    @Override
-    public FileIdInfo attemptMatch(AbstractFile abstractFile) {
-        try {        
-            FileIdInfo ret = new FileIdInfo();
-            final int maxBytesInitial = 3000; //how many bytes to read on first pass
-            byte buffer[] = new byte[maxBytesInitial];
-            int len = abstractFile.read(buffer, 0, maxBytesInitial);        
-            
-            try {
-                LinkedHashSet mimeSet = (LinkedHashSet)mimeUtil.getMimeTypesByteArray(buffer);
-
-                Iterator it =  mimeSet.iterator(); 
-                while (it.hasNext()) {
-                    MimeType mt = (MimeType)it.next();
-                    ret.type = mt.getMediaType() + "/" + mt.getSubType();
-                    break; //just take the first one for now
-                }
-
-            } catch (MimeException ex) {
-                //do nothing
-            }
-
-            return ret;
-
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return new FileIdInfo();
-        }        
-    }    
-    
-}
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
index 45dad3ccca..e623b4f561 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -42,12 +43,12 @@ import org.sleuthkit.datamodel.TskException;
 import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.datamodel.HashInfo;
 
 public class HashDbIngestModule extends IngestModuleAdapter implements FileIngestModule {
     private static final Logger logger = Logger.getLogger(HashDbIngestModule.class.getName());
     private static final int MAX_COMMENT_SIZE = 500;
-    private static int messageId = 0; // RJCTODO: This is not thread safe
     private final IngestServices services = IngestServices.getInstance();
     private final Hash hasher = new Hash();
     private final SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
@@ -55,9 +56,11 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
     private final HashLookupModuleSettings settings;
     private List<HashDb> knownBadHashSets = new ArrayList<>();
     private List<HashDb> knownHashSets = new ArrayList<>();
-    private int knownBadCount = 0;
-    private long calctime = 0;
-    private long lookuptime = 0;
+    private long jobId;
+    private static AtomicLong totalKnownBadCount = new AtomicLong(0);
+    private static AtomicLong totalCalctime = new AtomicLong(0);
+    private static AtomicLong totalLookuptime = new AtomicLong(0);
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
     
     HashDbIngestModule(HashLookupModuleSettings settings) {
         this.settings = settings;
@@ -65,24 +68,30 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
         
     @Override
     public void startUp(org.sleuthkit.autopsy.ingest.IngestJobContext context) throws IngestModuleException {
+        jobId = context.getJobId();        
         getEnabledHashSets(hashDbManager.getKnownBadFileHashSets(), knownBadHashSets);
-        if (knownBadHashSets.isEmpty()) {
-            services.postMessage(IngestMessage.createWarningMessage(++messageId,
-                                HashLookupModuleFactory.getModuleName(),
-                                NbBundle.getMessage(this.getClass(),
-                                                    "HashDbIngestModule.noKnownBadHashDbSetMsg"),
-                                NbBundle.getMessage(this.getClass(),
-                                                    "HashDbIngestModule.knownBadFileSearchWillNotExecuteWarn")));
-        }        
-
         getEnabledHashSets(hashDbManager.getKnownFileHashSets(), knownHashSets);        
-        if (knownHashSets.isEmpty()) {
-            services.postMessage(IngestMessage.createWarningMessage(++messageId,
-                                HashLookupModuleFactory.getModuleName(),
-                                NbBundle.getMessage(this.getClass(),
-                                                    "HashDbIngestModule.noKnownHashDbSetMsg"),
-                                NbBundle.getMessage(this.getClass(),
-                                                    "HashDbIngestModule.knownFileSearchWillNotExecuteWarn")));
+        
+        if (refCounter.incrementAndGet(jobId) == 1) {      
+            // if first module for this job then post error msgs if needed
+            
+            if (knownBadHashSets.isEmpty()) {
+                services.postMessage(IngestMessage.createWarningMessage(
+                    HashLookupModuleFactory.getModuleName(),
+                    NbBundle.getMessage(this.getClass(),
+                        "HashDbIngestModule.noKnownBadHashDbSetMsg"),
+                    NbBundle.getMessage(this.getClass(),
+                        "HashDbIngestModule.knownBadFileSearchWillNotExecuteWarn")));
+            }        
+
+            if (knownHashSets.isEmpty()) {
+                services.postMessage(IngestMessage.createWarningMessage(
+                    HashLookupModuleFactory.getModuleName(),
+                    NbBundle.getMessage(this.getClass(),
+                        "HashDbIngestModule.noKnownHashDbSetMsg"),
+                    NbBundle.getMessage(this.getClass(),
+                        "HashDbIngestModule.knownFileSearchWillNotExecuteWarn")));
+            }
         }
     }
     
@@ -121,10 +130,12 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
             try {
                 long calcstart = System.currentTimeMillis();
                 md5Hash = hasher.calculateMd5(file);
-                calctime += (System.currentTimeMillis() - calcstart);
+                long delta = (System.currentTimeMillis() - calcstart);
+                totalCalctime.addAndGet(delta);
+                
             } catch (IOException ex) {
                 logger.log(Level.WARNING, "Error calculating hash of file " + name, ex);
-                services.postMessage(IngestMessage.createErrorMessage(++messageId,
+                services.postMessage(IngestMessage.createErrorMessage(
                                       HashLookupModuleFactory.getModuleName(),
                                       NbBundle.getMessage(this.getClass(),
                                                           "HashDbIngestModule.fileReadErrorMsg",
@@ -145,12 +156,13 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                 HashInfo hashInfo = db.lookUp(file);
                 if (null != hashInfo) {
                     foundBad = true;
-                    knownBadCount += 1;
+                    totalKnownBadCount.incrementAndGet();
+                    
                     try {
                         skCase.setKnown(file, TskData.FileKnown.BAD);
                     } catch (TskException ex) {
                         logger.log(Level.WARNING, "Couldn't set known bad state for file " + name + " - see sleuthkit log for details", ex);
-                        services.postMessage(IngestMessage.createErrorMessage(++messageId,
+                        services.postMessage(IngestMessage.createErrorMessage(
                                               HashLookupModuleFactory.getModuleName(),
                                               NbBundle.getMessage(this.getClass(),
                                                                   "HashDbIngestModule.hashLookupErrorMsg",
@@ -178,10 +190,12 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
 
                     postHashSetHitToBlackboard(file, md5Hash, hashSetName, comment, db.getSendIngestMessages());
                 }
-                lookuptime += (System.currentTimeMillis() - lookupstart);
+                long delta = (System.currentTimeMillis() - lookupstart);
+                totalLookuptime.addAndGet(delta);
+
             } catch (TskException ex) {
                 logger.log(Level.WARNING, "Couldn't lookup known bad hash for file " + name + " - see sleuthkit log for details", ex);
-                services.postMessage(IngestMessage.createErrorMessage(++messageId,
+                services.postMessage(IngestMessage.createErrorMessage(
                                       HashLookupModuleFactory.getModuleName(),
                                       NbBundle.getMessage(this.getClass(),
                                                           "HashDbIngestModule.hashLookupErrorMsg",
@@ -209,10 +223,12 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                             ret = ProcessResult.ERROR;
                         }
                     }
-                    lookuptime += (System.currentTimeMillis() - lookupstart);
+                    long delta = (System.currentTimeMillis() - lookupstart);
+                    totalLookuptime.addAndGet(delta);
+
                 } catch (TskException ex) {
                     logger.log(Level.WARNING, "Couldn't lookup known hash for file " + name + " - see sleuthkit log for details", ex);
-                    services.postMessage(IngestMessage.createErrorMessage(++messageId,
+                    services.postMessage(IngestMessage.createErrorMessage(
                                           HashLookupModuleFactory.getModuleName(),
                                           NbBundle.getMessage(this.getClass(),
                                                               "HashDbIngestModule.hashLookupErrorMsg",
@@ -272,7 +288,7 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
 
                 detailsSb.append("</table>");
 
-                services.postMessage(IngestMessage.createDataMessage(++messageId, HashLookupModuleFactory.getModuleName(),
+                services.postMessage(IngestMessage.createDataMessage( HashLookupModuleFactory.getModuleName(),
                          NbBundle.getMessage(this.getClass(),
                                              "HashDbIngestModule.postToBB.knownBadMsg",
                                              abstractFile.getName()),
@@ -286,41 +302,43 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
         }
     }
 
-    
+               
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        if ((!knownBadHashSets.isEmpty()) || (!knownHashSets.isEmpty())) {
-            StringBuilder detailsSb = new StringBuilder();
-            //details
-            detailsSb.append("<table border='0' cellpadding='4' width='280'>");
+        if (refCounter.decrementAndGet(jobId) == 0) {
+            if ((!knownBadHashSets.isEmpty()) || (!knownHashSets.isEmpty())) {
+                StringBuilder detailsSb = new StringBuilder();
+                //details
+                detailsSb.append("<table border='0' cellpadding='4' width='280'>");
 
-            detailsSb.append("<tr><td>")
-                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.knownBadsFound"))
-                     .append("</td>");
-            detailsSb.append("<td>").append(knownBadCount).append("</td></tr>");
+                detailsSb.append("<tr><td>")
+                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.knownBadsFound"))
+                         .append("</td>");
+                detailsSb.append("<td>").append(totalKnownBadCount.get()).append("</td></tr>");
 
-            detailsSb.append("<tr><td>")
-                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalCalcTime"))
-                     .append("</td><td>").append(calctime).append("</td></tr>\n");
-            detailsSb.append("<tr><td>")
-                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalLookupTime"))
-                     .append("</td><td>").append(lookuptime).append("</td></tr>\n");
-            detailsSb.append("</table>");
+                detailsSb.append("<tr><td>")
+                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalCalcTime"))
+                         .append("</td><td>").append(totalCalctime.get()).append("</td></tr>\n");
+                detailsSb.append("<tr><td>")
+                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalLookupTime"))
+                         .append("</td><td>").append(totalLookuptime.get()).append("</td></tr>\n");
+                detailsSb.append("</table>");
 
-            detailsSb.append("<p>")
-                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.databasesUsed"))
-                     .append("</p>\n<ul>");
-            for (HashDb db : knownBadHashSets) {
-                detailsSb.append("<li>").append(db.getHashSetName()).append("</li>\n");
+                detailsSb.append("<p>")
+                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.databasesUsed"))
+                         .append("</p>\n<ul>");
+                for (HashDb db : knownBadHashSets) {
+                    detailsSb.append("<li>").append(db.getHashSetName()).append("</li>\n");
+                }
+
+                detailsSb.append("</ul>");
+                services.postMessage(IngestMessage.createMessage(
+                    IngestMessage.MessageType.INFO,
+                    HashLookupModuleFactory.getModuleName(),
+                    NbBundle.getMessage(this.getClass(),
+                                        "HashDbIngestModule.complete.hashLookupResults"),
+                    detailsSb.toString()));
             }
-
-            detailsSb.append("</ul>");
-            services.postMessage(IngestMessage.createMessage(++messageId,
-                                 IngestMessage.MessageType.INFO,
-                                 HashLookupModuleFactory.getModuleName(),
-                                 NbBundle.getMessage(this.getClass(),
-                                                     "HashDbIngestModule.complete.hashLookupResults"),
-                                 detailsSb.toString()));
         }
     }
 }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
index 02b307fc8f..4e1e9ceb70 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.hashdatabase;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.EventQueue;
 import java.awt.Frame;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
@@ -71,8 +72,13 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSetttingsPa
         IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                if (isFileIngestStatusChangeEvent(evt)) {
-                    updateComponents();
+                if (isIngestJobEvent(evt)) {
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            updateComponents();
+                        }
+                    });                                
                 }
             }
         });
@@ -224,8 +230,10 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSetttingsPa
         return shortenedPath;
     }
 
-    private boolean isFileIngestStatusChangeEvent(PropertyChangeEvent evt) {
-        return evt.getPropertyName().equals(IngestManager.IngestEvent.STARTED.toString()) || evt.getPropertyName().equals(IngestManager.IngestEvent.COMPLETED.toString()) || evt.getPropertyName().equals(IngestManager.IngestEvent.STOPPED.toString());
+    private boolean isIngestJobEvent(PropertyChangeEvent evt) {
+        return evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_STARTED.toString())
+                || evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_COMPLETED.toString())
+                || evt.getPropertyName().equals(IngestManager.IngestEvent.INGEST_JOB_CANCELLED.toString());
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
index e013ec2fac..7af85f7e3f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
@@ -177,10 +177,6 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
                             + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
-
-                //check if need invoke commit/search between chunks
-                //not to delay commit if timer has gone off
-                module.checkRunCommitSearch();
             }
         } catch (IOException ex) {
             logger.log(Level.WARNING, "Unable to read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 4d82827c6a..6f96ff2495 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -147,10 +147,6 @@ class AbstractFileStringExtract implements AbstractFileExtract {
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
 
-                //check if need invoke commit/search between chunks
-                //not to delay commit if timer has gone off
-                module.checkRunCommitSearch();
-
                 //debug.close();    
             }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
index 4f52805753..e19be18a5c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
@@ -223,10 +223,6 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
                             + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
-
-                //check if need invoke commit/search between chunks
-                //not to delay commit if timer has gone off
-                module.checkRunCommitSearch();
             }
         } catch (IOException ex) {
             final String msg = "Exception: Unable to read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 040e9e0c03..a608ce590f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -263,3 +263,10 @@ KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=1 minute (faster
 KeywordSearchGlobalSearchSettingsPanel.chunksLabel.text=Chunks in keyword index:
 KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=5 minutes (overall ingest time will be longer)
 KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.text=5 minutes (default)
+KeywordSearchIngestModule.regExpHitLbl=Reg Ex hit: 
+KeywordSearchIngestModule.kwHitLbl=Keyword hit: 
+KeywordSearchIngestModule.kwHitThLbl=Keyword
+KeywordSearchIngestModule.previewThLbl=Preview
+KeywordSearchIngestModule.fileThLbl=File
+KeywordSearchIngestModule.listThLbl=List
+KeywordSearchIngestModule.regExThLbl=Reg Ex
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index 12d9999b01..bdb304dabf 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -53,7 +53,6 @@ import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.DerivedFile;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
-import org.sleuthkit.datamodel.FsContent;
 import org.sleuthkit.datamodel.LayoutFile;
 import org.sleuthkit.datamodel.LocalFile;
 import org.sleuthkit.datamodel.ReadContentInputStream;
@@ -66,7 +65,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 class Ingester {
 
     private static final Logger logger = Logger.getLogger(Ingester.class.getName());
-    private boolean uncommitedIngests = false;
+    private volatile boolean uncommitedIngests = false;
     private final ExecutorService upRequestExecutor = Executors.newSingleThreadExecutor();
     private final Server solrServer = KeywordSearch.getServer();
     private final GetContentFieldsV getContentFieldsV = new GetContentFieldsV();
@@ -74,8 +73,7 @@ class Ingester {
    
     //for ingesting chunk as SolrInputDocument (non-content-streaming, by-pass tika)
     //TODO use a streaming way to add content to /update handler
-    private final static int MAX_DOC_CHUNK_SIZE = 1024*1024;
-    private final byte[] docChunkContentBuf = new byte[MAX_DOC_CHUNK_SIZE];
+    private static final int MAX_DOC_CHUNK_SIZE = 1024*1024;
     private static final String docContentEncoding = "UTF-8";
 
 
@@ -286,6 +284,7 @@ class Ingester {
             throw new IngesterException(msg);
         }
         
+        final byte[] docChunkContentBuf = new byte[MAX_DOC_CHUNK_SIZE];
         SolrInputDocument updateDoc = new SolrInputDocument();
 
         for (String key : fields.keySet()) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form
index 1f31418be7..83675f4797 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form
@@ -39,14 +39,6 @@
       </SubComponents>
     </Container>
   </NonVisualComponents>
-  <Properties>
-    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[340, 300]"/>
-    </Property>
-    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[340, 420]"/>
-    </Property>
-  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -67,7 +59,10 @@
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="listEditorPanel" alignment="0" max="32767" attributes="0"/>
+          <Group type="102" attributes="0">
+              <Component id="listEditorPanel" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
@@ -114,7 +109,7 @@
                                           </Group>
                                       </Group>
                                   </Group>
-                                  <EmptySpace min="0" pref="44" max="32767" attributes="0"/>
+                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                               </Group>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
@@ -128,8 +123,9 @@
               <Group type="102" alignment="1" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="keywordsLabel" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" max="-2" attributes="0"/>
-                  <Component id="jScrollPane1" min="-2" pref="188" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jScrollPane1" min="-2" pref="178" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
                           <Group type="103" groupAlignment="1" attributes="0">
@@ -146,15 +142,15 @@
                           <Component id="listOptionsSeparator" min="-2" pref="6" max="-2" attributes="0"/>
                       </Group>
                   </Group>
-                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Component id="ingestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="13" max="32767" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="exportButton" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="saveListButton" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="deleteListButton" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 0014a785e0..27ba1933e5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -52,7 +53,6 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
     private static Logger logger = Logger.getLogger(KeywordSearchEditListPanel.class.getName());
     private KeywordTableModel tableModel;
     private KeywordList currentKeywordList;
-    private boolean ingestRunning;
 
     /**
      * Creates new form KeywordSearchEditListPanel
@@ -101,7 +101,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
             }
         });
 
-        initButtons();
+        setButtonStates();
 
         addWordField.setComponentPopupMenu(rightClickMenu);
         ActionListener actList = new ActionListener() {
@@ -124,49 +124,28 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
         pasteMenuItem.addActionListener(actList);
         selectAllMenuItem.addActionListener(actList);
 
-        if (IngestManager.getInstance().isIngestRunning()) {
-            initIngest(0);
-        } else {
-            initIngest(1);
-        }
+        setButtonStates();
 
         IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 String changed = evt.getPropertyName();
-                Object oldValue = evt.getOldValue();
-                if (changed.equals(IngestEvent.COMPLETED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(1);
-                } else if (changed.equals(IngestEvent.STARTED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(0);
-                } else if (changed.equals(IngestEvent.STOPPED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(1);
+                if (changed.equals(IngestEvent.INGEST_JOB_STARTED.toString())
+                        || changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString())
+                        || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) {
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            setButtonStates();
+                        }
+                    });            
                 }
             }
         });
     }
 
-    /**
-     * Initialize this panel depending on whether ingest is running
-     *
-     * @param running case 0: ingest running case 1: ingest not running
-     */
-    private void initIngest(int running) {
-        switch (running) {
-            case 0:
-                ingestRunning = true;
-                break;
-            case 1:
-                ingestRunning = false;
-                break;
-        }
-        initButtons();
-    }
-
-    void initButtons() {
+    void setButtonStates() {
+        boolean ingestRunning = IngestManager.getInstance().isIngestRunning();
         boolean listSet = currentKeywordList != null;
         boolean isLocked = !listSet ? true : currentKeywordList.isLocked();
         boolean noKeywords = !listSet ? true : currentKeywordList.getKeywords().isEmpty();
@@ -237,9 +216,6 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
         selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.selectAllMenuItem.text")); // NOI18N
         rightClickMenu.add(selectAllMenuItem);
 
-        setMinimumSize(new java.awt.Dimension(340, 300));
-        setPreferredSize(new java.awt.Dimension(340, 420));
-
         jScrollPane1.setPreferredSize(new java.awt.Dimension(340, 300));
 
         keywordTable.setModel(tableModel);
@@ -363,7 +339,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
                                                 .addComponent(saveListButton)
                                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                                 .addComponent(deleteListButton)))))
-                                .addGap(0, 44, Short.MAX_VALUE)))
+                                .addGap(0, 0, Short.MAX_VALUE)))
                         .addContainerGap())))
         );
         listEditorPanelLayout.setVerticalGroup(
@@ -372,7 +348,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
                 .addContainerGap()
                 .addComponent(keywordsLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 188, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 178, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(10, 10, 10)
                 .addGroup(listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(listEditorPanelLayout.createSequentialGroup()
                         .addGroup(listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
@@ -385,14 +362,14 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
                     .addGroup(listEditorPanelLayout.createSequentialGroup()
                         .addGap(123, 123, 123)
                         .addComponent(listOptionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                .addGap(18, 18, 18)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(ingestMessagesCheckbox)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 13, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(exportButton)
                     .addComponent(saveListButton)
                     .addComponent(deleteListButton))
-                .addGap(42, 42, 42))
+                .addContainerGap())
         );
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -403,7 +380,9 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(listEditorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(listEditorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -441,7 +420,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
         chRegex.setSelected(false);
         addWordField.setText("");
 
-        initButtons();
+        setButtonStates();
     }//GEN-LAST:event_addWordButtonActionPerformed
 
     private void deleteWordButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteWordButtonActionPerformed
@@ -449,7 +428,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
             tableModel.deleteSelected(keywordTable.getSelectedRows());
             KeywordSearchListsXML.getCurrent().addList(currentKeywordList);
-            initButtons();
+            setButtonStates();
         }
     }//GEN-LAST:event_deleteWordButtonActionPerformed
 
@@ -549,11 +528,11 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
             currentKeywordList = loader.getListsL(false).get(index);
             tableModel.resync();
-            initButtons();
+            setButtonStates();
         } else {
             currentKeywordList = null;
             tableModel.resync();
-            initButtons();
+            setButtonStates();
         }
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.form
index bad2ca29c9..e0660ba6b1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.form
@@ -16,7 +16,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="mainSplitPane" alignment="0" max="32767" attributes="0"/>
+          <Component id="mainSplitPane" alignment="0" pref="665" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -57,6 +57,11 @@
           </Layout>
         </Container>
         <Container class="javax.swing.JPanel" name="rightPanel">
+          <Properties>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[360, 327]"/>
+            </Property>
+          </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="right"/>
@@ -66,7 +71,7 @@
           <Layout>
             <DimensionLayout dim="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="318" max="32767" attributes="0"/>
+                  <EmptySpace min="0" pref="385" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
             <DimensionLayout dim="1">
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
index 36b22ef853..ac8e74212d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
@@ -44,7 +44,7 @@ final class KeywordSearchGlobalListSettingsPanel extends javax.swing.JPanel impl
                 if (KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.title"), NbBundle.getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.customizeComponents.body"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN)) {
                     String toDelete = editListPanel.getCurrentKeywordList().getName();
                     editListPanel.setCurrentKeywordList(null);
-                    editListPanel.initButtons();
+                    editListPanel.setButtonStates();
                     // RJCTODO: Move this into a deleteList method in the manager
                     KeywordSearchListsXML deleter = KeywordSearchListsXML.getCurrent();
                     deleter.deleteList(toDelete);
@@ -152,11 +152,13 @@ final class KeywordSearchGlobalListSettingsPanel extends javax.swing.JPanel impl
 
         mainSplitPane.setLeftComponent(leftPanel);
 
+        rightPanel.setPreferredSize(new java.awt.Dimension(360, 327));
+
         javax.swing.GroupLayout rightPanelLayout = new javax.swing.GroupLayout(rightPanel);
         rightPanel.setLayout(rightPanelLayout);
         rightPanelLayout.setHorizontalGroup(
             rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 318, Short.MAX_VALUE)
+            .addGap(0, 385, Short.MAX_VALUE)
         );
         rightPanelLayout.setVerticalGroup(
             rightPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -169,7 +171,7 @@ final class KeywordSearchGlobalListSettingsPanel extends javax.swing.JPanel impl
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(mainSplitPane)
+            .addComponent(mainSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 665, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form
index 6a22cf2579..a660de43de 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form
@@ -16,12 +16,12 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="tabbedPane" alignment="0" pref="400" max="32767" attributes="0"/>
+          <Component id="tabbedPane" alignment="0" pref="670" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="tabbedPane" alignment="0" pref="300" max="32767" attributes="0"/>
+          <Component id="tabbedPane" alignment="0" pref="310" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
   </Layout>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
index 44e1dc22a1..d400abe80c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
@@ -63,11 +63,11 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSetttings
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 670, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
+            .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 310, Short.MAX_VALUE)
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
old mode 100755
new mode 100644
index 867e59eb16..dbb9c198e5
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -18,36 +18,19 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-import javax.swing.Timer;
 import org.apache.tika.Tika;
-import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
-import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
-import org.netbeans.api.progress.aggregate.ProgressContributor;
-import org.openide.util.Cancellable;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
-import org.sleuthkit.autopsy.coreutils.StopWatch;
 import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestServices;
@@ -55,11 +38,8 @@ import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
 import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
-import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException;
-import org.sleuthkit.datamodel.BlackboardArtifact;
-import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
-import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.SleuthkitCase;
@@ -97,29 +77,23 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
     private static final Logger logger = Logger.getLogger(KeywordSearchIngestModule.class.getName());
     private IngestServices services = IngestServices.getInstance();
     private Ingester ingester = null;
-    private volatile boolean commitIndex = false; //whether to commit index next time
-    private volatile boolean runSearcher = false; //whether to run searcher next time
-    private Timer commitTimer;
-    private Timer searchTimer;
     private Indexer indexer;
-    private Searcher currentSearcher;
-    private Searcher finalSearcher;
-    private volatile boolean searcherDone = true; //mark as done, until it's inited
-    private Map<Keyword, List<Long>> currentResults;
     //only search images from current ingest, not images previously ingested/indexed
     //accessed read-only by searcher thread
-    private Set<Long> curDataSourceIds;
-    private static final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock(true); //use fairness policy
-    private static final Lock searcherLock = rwLock.writeLock();
-    private volatile int messageID = 0; // RJCTODO: Despite volatile, this is not thread safe, uses increment (not atomic)
-    private boolean processedFiles;
+
+    private boolean startedSearching = false;
     private SleuthkitCase caseHandle = null;
-    private static List<AbstractFileExtract> textExtractors;
-    private static AbstractFileStringExtract stringExtractor;
+    private List<AbstractFileExtract> textExtractors;
+    private AbstractFileStringExtract stringExtractor;
     private final KeywordSearchJobSettings settings;
     private boolean initialized = false;
     private Tika tikaFormatDetector;
-
+    private long jobId;
+    private long dataSourceId;   
+    private static AtomicInteger instanceCount = new AtomicInteger(0); //just used for logging
+    private int instanceNum = 0;
+    private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
+    
     private enum IngestStatus {
 
         TEXT_INGESTED, /// Text was extracted by knowing file type and text_ingested
@@ -129,10 +103,17 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         SKIPPED_ERROR_TEXTEXTRACT, ///< File was skipped because of text extraction issues
         SKIPPED_ERROR_IO    ///< File was skipped because of IO issues reading it
     };
-    private Map<Long, IngestStatus> ingestStatus;
+    private static final Map<Long, IngestStatus> ingestStatus = new HashMap<>(); //guarded by itself
 
+    static void putIngestStatus(long id, IngestStatus status) {
+        synchronized(ingestStatus) {
+            ingestStatus.put(id, status);
+        }
+    }    
+    
     KeywordSearchIngestModule(KeywordSearchJobSettings settings) {
         this.settings = settings;
+        instanceNum = instanceCount.getAndIncrement();
     }
 
     /**
@@ -142,42 +123,58 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      */
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
-        logger.log(Level.INFO, "init()");
-        initialized = false;
-
+        logger.log(Level.INFO, "Initializing instance {0}", instanceNum);
+        initialized = false;       
+        jobId = context.getJobId();
         caseHandle = Case.getCurrentCase().getSleuthkitCase();
-
         tikaFormatDetector = new Tika();
-
         ingester = Server.getIngester();
 
-        final Server server = KeywordSearch.getServer();
-        try {
-            if (!server.isRunning()) {
+        // increment the module reference count
+        // if first instance of this module for this job then check the server and existence of keywords
+        if (refCounter.incrementAndGet(jobId) == 1) {
+            final Server server = KeywordSearch.getServer();
+            try {
+                if (!server.isRunning()) {
+                    String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg");
+                    logger.log(Level.SEVERE, msg);
+                    String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg);
+                    services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), msg, details));
+                    throw new IngestModuleException(msg);
+                }
+            } catch (KeywordSearchModuleException ex) {
+                logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex);
+                //this means Solr is not properly initialized
                 String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg");
-                logger.log(Level.SEVERE, msg);
                 String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg);
-                services.postMessage(IngestMessage.createErrorMessage(++messageID, KeywordSearchModuleFactory.getModuleName(), msg, details));
+                services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), msg, details));
                 throw new IngestModuleException(msg);
             }
-        } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex);
-            //this means Solr is not properly initialized
-            String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg");
-            String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg);
-            services.postMessage(IngestMessage.createErrorMessage(++messageID, KeywordSearchModuleFactory.getModuleName(), msg, details));
-            throw new IngestModuleException(msg);
-        }
-        try {
-            // make an actual query to verify that server is responding
-            // we had cases where getStatus was OK, but the connection resulted in a 404
-            server.queryNumIndexedDocuments();
-        } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
-            throw new IngestModuleException(
-                    NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.exception.errConnToSolr.msg",
-                    ex.getMessage()));
-        }
+            try {
+                // make an actual query to verify that server is responding
+                // we had cases where getStatus was OK, but the connection resulted in a 404
+                server.queryNumIndexedDocuments();
+            } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
+                throw new IngestModuleException(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.exception.errConnToSolr.msg",
+                        ex.getMessage()));
+            }
 
+            // check if this job has any searchable keywords    
+            List<KeywordList> keywordLists = KeywordSearchListsXML.getCurrent().getListsL();
+            boolean hasKeywordsForSearch = false;
+            for (KeywordList keywordList : keywordLists) {
+                if (settings.isKeywordListEnabled(keywordList.getName()) && !keywordList.getKeywords().isEmpty()) {
+                    hasKeywordsForSearch = true;
+                    break;
+                }
+            }
+            if (!hasKeywordsForSearch) {
+                services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg")));
+            }            
+        }
+        
         //initialize extractors
         stringExtractor = new AbstractFileStringExtract(this);
         stringExtractor.setScripts(KeywordSearchSettings.getStringExtractScripts());
@@ -194,57 +191,22 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         //order matters, more specific extractors first
         textExtractors.add(new AbstractFileHtmlExtract(this));
         textExtractors.add(new AbstractFileTikaTextExtract(this));
-
-        ingestStatus = new HashMap<>();
-
-        List<KeywordList> keywordLists = KeywordSearchListsXML.getCurrent().getListsL();
-        boolean hasKeywordsForSearch = false;
-        for (KeywordList keywordList : keywordLists) {
-            if (settings.isKeywordListEnabled(keywordList.getName()) && !keywordList.getKeywords().isEmpty()) {
-                hasKeywordsForSearch = true;
-                break;
-            }
-        }
-        if (!hasKeywordsForSearch) {
-            services.postMessage(IngestMessage.createWarningMessage(++messageID, KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"),
-                    NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg")));
-        }
-
-        processedFiles = false;
-        searcherDone = true; //make sure to start the initial currentSearcher
-        //keeps track of all results per run not to repeat reporting the same hits
-        currentResults = new HashMap<>();
-
-        curDataSourceIds = new HashSet<>();
-
+        
         indexer = new Indexer();
-
-        final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000;
-        logger.log(Level.INFO, "Using commit interval (ms): {0}", updateIntervalMs);
-        logger.log(Level.INFO, "Using searcher interval (ms): {0}", updateIntervalMs);
-
-        commitTimer = new Timer(updateIntervalMs, new CommitTimerAction());
-        searchTimer = new Timer(updateIntervalMs, new SearchTimerAction());
-
         initialized = true;
-
-        commitTimer.start();
-        searchTimer.start();
     }
 
     @Override
     public ProcessResult process(AbstractFile abstractFile) {
-
         if (initialized == false) //error initializing indexing/Solr
         {
             logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName());
-            ingestStatus.put(abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+            putIngestStatus(abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
             return ProcessResult.OK;
         }
         try {
             //add data source id of the file to the set, keeping track of images being ingested
-            final long fileSourceId = caseHandle.getFileDataSource(abstractFile);
-            curDataSourceIds.add(fileSourceId);
+            dataSourceId = caseHandle.getFileDataSource(abstractFile);
 
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex);
@@ -261,14 +223,16 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             return ProcessResult.OK;
         }
 
-        processedFiles = true;
-
-        //check if it's time to commit after previous processing
-        checkRunCommitSearch();
-
         //index the file and content (if the content is supported)
         indexer.indexFile(abstractFile, true);
 
+        // Start searching if it hasn't started already
+        if (!startedSearching) {
+            List<String> keywordListNames = settings.getNamesOfEnabledKeyWordLists();
+            SearchRunner.getInstance().startJob(jobId, dataSourceId, keywordListNames);
+            startedSearching = true;
+        }
+        
         return ProcessResult.OK;
     }
 
@@ -278,39 +242,26 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      */
     @Override
     public void shutDown(boolean ingestJobCancelled) {
+        logger.log(Level.INFO, "Instance {0}", instanceNum);
+       
         if (initialized == false) {
             return;
         }
 
         if (ingestJobCancelled) {
+            logger.log(Level.INFO, "Ingest job cancelled");
             stop();
             return;
         }
 
-        commitTimer.stop();
-
-        //NOTE, we let the 1 before last searcher complete fully, and enqueue the last one
-
-        //cancel searcher timer, ensure unwanted searcher does not start 
-        //before we start the final one
-        if (searchTimer.isRunning()) {
-            searchTimer.stop();
+        // Remove from the search list and trigger final commit and final search
+        SearchRunner.getInstance().endJob(jobId);
+        
+        // We only need to post the summary msg from the last module per job
+        if (refCounter.decrementAndGet(jobId) == 0) {
+            postIndexSummary();
         }
-        runSearcher = false;
-
-        logger.log(Level.INFO, "Running final index commit and search");
-        //final commit
-        commit();
-
-        postIndexSummary();
-
-        //run one last search as there are probably some new files committed
-        List<String> keywordLists = settings.getNamesOfEnabledKeyWordLists();
-        if (!keywordLists.isEmpty() && processedFiles == true) {
-            finalSearcher = new Searcher(keywordLists, true); //final searcher run
-            finalSearcher.execute();
-        }
-
+        
         //log number of files / chunks in index
         //signal a potential change in number of text_ingested files
         try {
@@ -321,8 +272,6 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
             logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files/chunks: ", ex);
         }
-
-        //cleanup done in final searcher
     }
 
     /**
@@ -331,22 +280,8 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
     private void stop() {
         logger.log(Level.INFO, "stop()");
 
-        //stop timer
-        commitTimer.stop();
-        //stop currentSearcher
-        if (currentSearcher != null) {
-            currentSearcher.cancel(true);
-        }
-
-        //cancel searcher timer, ensure unwanted searcher does not start 
-        if (searchTimer.isRunning()) {
-            searchTimer.stop();
-        }
-        runSearcher = false;
-
-        //commit uncommited files, don't search again
-        commit();
-
+        SearchRunner.getInstance().stopJob(jobId);
+    
         cleanup();
     }
 
@@ -354,16 +289,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      * Common cleanup code when module stops or final searcher completes
      */
     private void cleanup() {
-        ingestStatus.clear();
-        currentResults.clear();
-        curDataSourceIds.clear();
-        currentSearcher = null;
-        //finalSearcher = null; //do not collect, might be finalizing
-
-        commitTimer.stop();
-        searchTimer.stop();
-        commitTimer = null;
-        //searchTimer = null; // do not collect, final searcher might still be running, in which case it throws an exception
+        synchronized(ingestStatus) {
+            ingestStatus.clear();            
+        }
 
         textExtractors.clear();
         textExtractors = null;
@@ -374,19 +302,6 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         initialized = false;
     }
 
-    /**
-     * Commits index and notifies listeners of index update
-     */
-    private void commit() {
-        if (initialized) {
-            logger.log(Level.INFO, "Commiting index");
-            ingester.commit();
-            logger.log(Level.INFO, "Index comitted");
-            //signal a potential change in number of text_ingested files
-            indexChangeNotify();
-        }
-    }
-
     /**
      * Posts inbox message with summary of text_ingested files
      */
@@ -397,31 +312,34 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         int error_text = 0;
         int error_index = 0;
         int error_io = 0;
-        for (IngestStatus s : ingestStatus.values()) {
-            switch (s) {
-                case TEXT_INGESTED:
-                    ++text_ingested;
-                    break;
-                case METADATA_INGESTED:
-                    ++metadata_ingested;
-                    break;
-                case STRINGS_INGESTED:
-                    ++strings_ingested;
-                    break;
-                case SKIPPED_ERROR_TEXTEXTRACT:
-                    error_text++;
-                    break;
-                case SKIPPED_ERROR_INDEXING:
-                    error_index++;
-                    break;
-                case SKIPPED_ERROR_IO:
-                    error_io++;
-                    break;
-                default:
-                    ;
+
+        synchronized(ingestStatus) {
+            for (IngestStatus s : ingestStatus.values()) {
+                switch (s) {
+                    case TEXT_INGESTED:
+                        ++text_ingested;
+                        break;
+                    case METADATA_INGESTED:
+                        ++metadata_ingested;
+                        break;
+                    case STRINGS_INGESTED:
+                        ++strings_ingested;
+                        break;
+                    case SKIPPED_ERROR_TEXTEXTRACT:
+                        error_text++;
+                        break;
+                    case SKIPPED_ERROR_INDEXING:
+                        error_index++;
+                        break;
+                    case SKIPPED_ERROR_IO:
+                        error_io++;
+                        break;
+                    default:
+                       ;
+                }
             }
         }
-
+        
         StringBuilder msg = new StringBuilder();
         msg.append("<table border=0><tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("</td><td>").append(text_ingested).append("</td></tr>");
         msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("</td><td>").append(strings_ingested).append("</td></tr>");
@@ -432,7 +350,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         msg.append("</table>");
         String indexStats = msg.toString();
         logger.log(Level.INFO, "Keyword Indexing Completed: {0}", indexStats);
-        services.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl"), indexStats));
+        services.postMessage(IngestMessage.createMessage(MessageType.INFO, KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl"), indexStats));
         if (error_index > 0) {
             MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle"),
                     NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles", error_index));
@@ -442,73 +360,6 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         }
     }
 
-    /**
-     * Helper method to notify listeners on index update
-     */
-    private void indexChangeNotify() {
-        //signal a potential change in number of text_ingested files
-        try {
-            final int numIndexedFiles = KeywordSearch.getServer().queryNumIndexedFiles();
-            KeywordSearch.fireNumIndexedFilesChange(null, new Integer(numIndexedFiles));
-        } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files: ", ex);
-        }
-    }
-
-    /**
-     * Check if time to commit, if so, run commit. Then run search if search
-     * timer is also set.
-     */
-    void checkRunCommitSearch() {
-        if (commitIndex) {
-            logger.log(Level.INFO, "Commiting index");
-            commit();
-            commitIndex = false;
-
-            //after commit, check if time to run searcher
-            //NOTE commit/searcher timings don't need to align
-            //in worst case, we will run search next time after commit timer goes off, or at the end of ingest
-            if (searcherDone && runSearcher) {
-                //start search if previous not running
-                List<String> keywordLists = settings.getNamesOfEnabledKeyWordLists();
-                if (!keywordLists.isEmpty()) {
-                    currentSearcher = new Searcher(keywordLists);
-                    currentSearcher.execute();//searcher will stop timer and restart timer when done
-                }
-            }
-        }
-    }
-
-    /**
-     * CommitTimerAction to run by commitTimer Sets a flag to indicate we are
-     * ready for commit
-     */
-    private class CommitTimerAction implements ActionListener {
-
-        private final Logger logger = Logger.getLogger(CommitTimerAction.class.getName());
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            commitIndex = true;
-            logger.log(Level.INFO, "CommitTimer awake");
-        }
-    }
-
-    /**
-     * SearchTimerAction to run by searchTimer Sets a flag to indicate we are
-     * ready to search
-     */
-    private class SearchTimerAction implements ActionListener {
-
-        private final Logger logger = Logger.getLogger(SearchTimerAction.class.getName());
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            runSearcher = true;
-            logger.log(Level.INFO, "SearchTimer awake");
-        }
-    }
-
     /**
      * File indexer, processes and indexes known/allocated files,
      * unknown/unallocated files and directories accordingly
@@ -560,16 +411,16 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         private boolean extractStringsAndIndex(AbstractFile aFile) {
             try {
                 if (stringExtractor.index(aFile)) {
-                    ingestStatus.put(aFile.getId(), IngestStatus.STRINGS_INGESTED);
+                    putIngestStatus(aFile.getId(), IngestStatus.STRINGS_INGESTED);
                     return true;
                 } else {
                     logger.log(Level.WARNING, "Failed to extract strings and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()});
-                    ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                     return false;
                 }
             } catch (IngesterException ex) {
                 logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").", ex);
-                ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                 return false;
             }
         }
@@ -615,9 +466,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             if ((indexContent == false || aFile.isDir() || size == 0)) {
                 try {
                     ingester.ingest(aFile, false); //meta-data only
-                    ingestStatus.put(aFile.getId(), IngestStatus.METADATA_INGESTED);
+                    putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED);
                 } catch (IngesterException ex) {
-                    ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                     logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex);
                 }
                 return;
@@ -651,9 +502,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
                 try {
                     ingester.ingest(aFile, false); //meta-data only
-                    ingestStatus.put(aFile.getId(), IngestStatus.METADATA_INGESTED);
+                    putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED);
                 } catch (IngesterException ex) {
-                    ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                     logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex);
                 }
                 return;
@@ -666,20 +517,20 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
                     //logger.log(Level.INFO, "indexing: " + aFile.getName());
                     if (!extractTextAndIndex(aFile, detectedFormat)) {
                         logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()});
-                        ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                        putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                     } else {
-                        ingestStatus.put(aFile.getId(), IngestStatus.TEXT_INGESTED);
+                        putIngestStatus(aFile.getId(), IngestStatus.TEXT_INGESTED);
                         wasTextAdded = true;
                     }
 
                 } catch (IngesterException e) {
                     logger.log(Level.INFO, "Could not extract text with Tika, " + aFile.getId() + ", "
                             + aFile.getName(), e);
-                    ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                 } catch (Exception e) {
                     logger.log(Level.WARNING, "Error extracting text with Tika, " + aFile.getId() + ", "
                             + aFile.getName(), e);
-                    ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                 }
             }
 
@@ -689,421 +540,4 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             }
         }
     }
-
-    /**
-     * Searcher responsible for searching the current index and writing results
-     * to blackboard and the inbox. Also, posts results to listeners as Ingest
-     * data events. Searches entire index, and keeps track of only new results
-     * to report and save. Runs as a background thread.
-     */
-    private final class Searcher extends SwingWorker<Object, Void> {
-
-        /**
-         * Searcher has private copies/snapshots of the lists and keywords
-         */
-        private List<Keyword> keywords; //keywords to search
-        private List<String> keywordLists; // lists currently being searched
-        private Map<String, KeywordList> keywordToList; //keyword to list name mapping
-        private AggregateProgressHandle progressGroup;
-        private final Logger logger = Logger.getLogger(Searcher.class.getName());
-        private boolean finalRun = false;
-
-        Searcher(List<String> keywordLists) {
-            this.keywordLists = new ArrayList<>(keywordLists);
-            this.keywords = new ArrayList<>();
-            this.keywordToList = new HashMap<>();
-            //keywords are populated as searcher runs
-        }
-
-        Searcher(List<String> keywordLists, boolean finalRun) {
-            this(keywordLists);
-            this.finalRun = finalRun;
-        }
-
-        @Override
-        protected Object doInBackground() throws Exception {
-            if (finalRun) {
-                logger.log(Level.INFO, "Pending start of new (final) searcher");
-            } else {
-                logger.log(Level.INFO, "Pending start of new searcher");
-            }
-
-            final String displayName = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.displayName")
-                    + (finalRun ? (" - " + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.finalizeMsg")) : "");
-            progressGroup = AggregateProgressFactory.createSystemHandle(displayName + (" ("
-                    + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.pendingMsg") + ")"), null, new Cancellable() {
-                @Override
-                public boolean cancel() {
-                    logger.log(Level.INFO, "Cancelling the searcher by user.");
-                    if (progressGroup != null) {
-                        progressGroup.setDisplayName(displayName + " (" + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.cancelMsg") + "...)");
-                    }
-                    return Searcher.this.cancel(true);
-                }
-            }, null);
-
-            updateKeywords();
-
-            ProgressContributor[] subProgresses = new ProgressContributor[keywords.size()];
-            int i = 0;
-            for (Keyword keywordQuery : keywords) {
-                subProgresses[i] =
-                        AggregateProgressFactory.createProgressContributor(keywordQuery.getQuery());
-                progressGroup.addContributor(subProgresses[i]);
-                i++;
-            }
-
-            progressGroup.start();
-
-            //block to ensure previous searcher is completely done with doInBackground()
-            //even after previous searcher cancellation, we need to check this
-            searcherLock.lock();
-            final StopWatch stopWatch = new StopWatch();
-            stopWatch.start();
-            try {
-                logger.log(Level.INFO, "Started a new searcher");
-                progressGroup.setDisplayName(displayName);
-                //make sure other searchers are not spawned 
-                searcherDone = false;
-                runSearcher = false;
-                if (searchTimer.isRunning()) {
-                    searchTimer.stop();
-                }
-
-                int keywordsSearched = 0;
-
-                //updateKeywords();
-
-                for (Keyword keywordQuery : keywords) {
-                    if (this.isCancelled()) {
-                        logger.log(Level.INFO, "Cancel detected, bailing before new keyword processed: {0}", keywordQuery.getQuery());
-                        return null;
-                    }
-
-                    final String queryStr = keywordQuery.getQuery();
-                    final KeywordList list = keywordToList.get(queryStr);
-                    final String listName = list.getName();
-
-                    //new subProgress will be active after the initial query
-                    //when we know number of hits to start() with
-                    if (keywordsSearched > 0) {
-                        subProgresses[keywordsSearched - 1].finish();
-                    }
-
-
-                    KeywordSearchQuery del = null;
-
-                    boolean isRegex = !keywordQuery.isLiteral();
-                    if (isRegex) {
-                        del = new TermComponentQuery(keywordQuery);
-                    } else {
-                        del = new LuceneQuery(keywordQuery);
-                        del.escape();
-                    }
-
-                    //limit search to currently ingested data sources
-                    //set up a filter with 1 or more image ids OR'ed
-                    final KeywordQueryFilter dataSourceFilter = new KeywordQueryFilter(KeywordQueryFilter.FilterType.DATA_SOURCE, curDataSourceIds);
-                    del.addFilter(dataSourceFilter);
-
-                    Map<String, List<ContentHit>> queryResult;
-
-                    try {
-                        queryResult = del.performQuery();
-                    } catch (NoOpenCoreException ex) {
-                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), ex);
-                        //no reason to continue with next query if recovery failed
-                        //or wait for recovery to kick in and run again later
-                        //likely case has closed and threads are being interrupted
-                        return null;
-                    } catch (CancellationException e) {
-                        logger.log(Level.INFO, "Cancel detected, bailing during keyword query: {0}", keywordQuery.getQuery());
-                        return null;
-                    } catch (Exception e) {
-                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), e);
-                        continue;
-                    }
-
-                    // calculate new results but substracting results already obtained in this ingest
-                    // this creates a map of each keyword to the list of unique files that have that hit.  
-                    Map<Keyword, List<ContentHit>> newResults = filterResults(queryResult, isRegex);
-
-                    if (!newResults.isEmpty()) {
-
-                        //write results to BB
-
-                        //new artifacts created, to report to listeners
-                        Collection<BlackboardArtifact> newArtifacts = new ArrayList<>();
-
-                        //scale progress bar more more granular, per result sub-progress, within per keyword
-                        int totalUnits = newResults.size();
-                        subProgresses[keywordsSearched].start(totalUnits);
-                        int unitProgress = 0;
-                        String queryDisplayStr = keywordQuery.getQuery();
-                        if (queryDisplayStr.length() > 50) {
-                            queryDisplayStr = queryDisplayStr.substring(0, 49) + "...";
-                        }
-                        subProgresses[keywordsSearched].progress(listName + ": " + queryDisplayStr, unitProgress);
-
-
-                        /* cycle through the keywords returned -- only one unless it was a regexp */
-                        for (final Keyword hitTerm : newResults.keySet()) {
-                            //checking for cancellation between results
-                            if (this.isCancelled()) {
-                                logger.log(Level.INFO, "Cancel detected, bailing before new hit processed for query: {0}", keywordQuery.getQuery());
-                                return null;
-                            }
-
-                            // update progress display
-                            String hitDisplayStr = hitTerm.getQuery();
-                            if (hitDisplayStr.length() > 50) {
-                                hitDisplayStr = hitDisplayStr.substring(0, 49) + "...";
-                            }
-                            subProgresses[keywordsSearched].progress(listName + ": " + hitDisplayStr, unitProgress);
-                            //subProgresses[keywordsSearched].progress(unitProgress);
-
-                            // this returns the unique files in the set with the first chunk that has a hit
-                            Map<AbstractFile, Integer> contentHitsFlattened = ContentHit.flattenResults(newResults.get(hitTerm));
-                            for (final AbstractFile hitFile : contentHitsFlattened.keySet()) {
-
-                                // get the snippet for the first hit in the file
-                                String snippet;
-                                final String snippetQuery = KeywordSearchUtil.escapeLuceneQuery(hitTerm.getQuery());
-                                int chunkId = contentHitsFlattened.get(hitFile);
-                                try {
-                                    snippet = LuceneQuery.querySnippet(snippetQuery, hitFile.getId(), chunkId, isRegex, true);
-                                } catch (NoOpenCoreException e) {
-                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
-                                    //no reason to continue
-                                    return null;
-                                } catch (Exception e) {
-                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
-                                    continue;
-                                }
-
-                                // write the blackboard artifact for this keyword in this file
-                                KeywordWriteResult written = del.writeToBlackBoard(hitTerm.getQuery(), hitFile, snippet, listName);
-                                if (written == null) {
-                                    logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hitFile, hitTerm.toString()});
-                                    continue;
-                                }
-
-                                newArtifacts.add(written.getArtifact());
-
-                                //generate an ingest inbox message for this keyword in this file
-                                if (list.getIngestMessages()) {
-                                    StringBuilder subjectSb = new StringBuilder();
-                                    StringBuilder detailsSb = new StringBuilder();
-                                    //final int hitFiles = newResults.size();
-
-                                    if (!keywordQuery.isLiteral()) {
-                                        subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExpHitLbl"));
-                                    } else {
-                                        subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitLbl"));
-                                    }
-                                    //subjectSb.append("<");
-                                    String uniqueKey = null;
-                                    BlackboardAttribute attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID());
-                                    if (attr != null) {
-                                        final String keyword = attr.getValueString();
-                                        subjectSb.append(keyword);
-                                        uniqueKey = keyword.toLowerCase();
-                                    }
-
-                                    //subjectSb.append(">");
-                                    //String uniqueKey = queryStr;
-
-                                    //details
-                                    detailsSb.append("<table border='0' cellpadding='4' width='280'>");
-                                    //hit
-                                    detailsSb.append("<tr>");
-                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitLThLbl"));
-                                    detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
-                                    detailsSb.append("</tr>");
-
-                                    //preview
-                                    attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID());
-                                    if (attr != null) {
-                                        detailsSb.append("<tr>");
-                                        detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.previewThLbl"));
-                                        detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
-                                        detailsSb.append("</tr>");
-
-                                    }
-
-                                    //file
-                                    detailsSb.append("<tr>");
-                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.fileThLbl"));
-                                    detailsSb.append("<td>").append(hitFile.getParentPath()).append(hitFile.getName()).append("</td>");
-
-                                    detailsSb.append("</tr>");
-
-
-                                    //list
-                                    attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID());
-                                    detailsSb.append("<tr>");
-                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.listThLbl"));
-                                    detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
-                                    detailsSb.append("</tr>");
-
-                                    //regex
-                                    if (!keywordQuery.isLiteral()) {
-                                        attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID());
-                                        if (attr != null) {
-                                            detailsSb.append("<tr>");
-                                            detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExThLbl"));
-                                            detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
-                                            detailsSb.append("</tr>");
-
-                                        }
-                                    }
-                                    detailsSb.append("</table>");
-
-                                    services.postMessage(IngestMessage.createDataMessage(++messageID, KeywordSearchModuleFactory.getModuleName(), subjectSb.toString(), detailsSb.toString(), uniqueKey, written.getArtifact()));
-                                }
-                            } //for each file hit
-
-                            ++unitProgress;
-
-                        }//for each hit term
-
-                        //update artifact browser
-                        if (!newArtifacts.isEmpty()) {
-                            services.fireModuleDataEvent(new ModuleDataEvent(KeywordSearchModuleFactory.getModuleName(), ARTIFACT_TYPE.TSK_KEYWORD_HIT, newArtifacts));
-                        }
-                    } //if has results
-
-                    //reset the status text before it goes away
-                    subProgresses[keywordsSearched].progress("");
-
-                    ++keywordsSearched;
-
-                } //for each keyword
-
-            } //end try block
-            catch (Exception ex) {
-                logger.log(Level.WARNING, "searcher exception occurred", ex);
-            } finally {
-                try {
-                    finalizeSearcher();
-                    stopWatch.stop();
-                    logger.log(Level.INFO, "Searcher took to run: {0} secs.", stopWatch.getElapsedTimeSecs());
-                } finally {
-                    searcherLock.unlock();
-                }
-            }
-
-            return null;
-        }
-
-        @Override
-        protected void done() {
-            // call get to see if there were any errors
-            try {
-                get();
-            } catch (InterruptedException | ExecutionException e) {
-                logger.log(Level.SEVERE, "Error performing keyword search: " + e.getMessage());
-                services.postMessage(IngestMessage.createErrorMessage(++messageID, KeywordSearchModuleFactory.getModuleName(), "Error performing keyword search", e.getMessage()));
-            } // catch and ignore if we were cancelled
-            catch (java.util.concurrent.CancellationException ex) {
-            }
-        }
-
-        /**
-         * Sync-up the updated keywords from the currently used lists in the XML
-         */
-        private void updateKeywords() {
-            KeywordSearchListsXML loader = KeywordSearchListsXML.getCurrent();
-
-            this.keywords.clear();
-            this.keywordToList.clear();
-
-            for (String name : this.keywordLists) {
-                KeywordList list = loader.getList(name);
-                for (Keyword k : list.getKeywords()) {
-                    this.keywords.add(k);
-                    this.keywordToList.put(k.getQuery(), list);
-                }
-            }
-
-
-        }
-
-        //perform all essential cleanup that needs to be done right AFTER doInBackground() returns
-        //without relying on done() method that is not guaranteed to run after background thread completes
-        //NEED to call this method always right before doInBackground() returns
-        /**
-         * Performs the cleanup that needs to be done right AFTER
-         * doInBackground() returns without relying on done() method that is not
-         * guaranteed to run after background thread completes REQUIRED to call
-         * this method always right before doInBackground() returns
-         */
-        private void finalizeSearcher() {
-            logger.log(Level.INFO, "Searcher finalizing");
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    progressGroup.finish();
-                }
-            });
-            searcherDone = true;  //next currentSearcher can start
-
-            if (finalRun) {
-                //this is the final searcher
-                logger.log(Level.INFO, "The final searcher in this ingest done.");
-
-                //run module cleanup
-                cleanup();
-            } else {
-                //start counting time for a new searcher to start
-                //unless final searcher is pending
-                if (finalSearcher == null) {
-                    //we need a new Timer object, because restarting previus will not cause firing of the action
-                    final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000;
-                    searchTimer = new Timer(updateIntervalMs, new SearchTimerAction());
-                    searchTimer.start();
-                }
-            }
-        }
-
-        //calculate new results but substracting results already obtained in this ingest
-        //update currentResults map with the new results
-        private Map<Keyword, List<ContentHit>> filterResults(Map<String, List<ContentHit>> queryResult, boolean isRegex) {
-            Map<Keyword, List<ContentHit>> newResults = new HashMap<>();
-
-            for (String termResult : queryResult.keySet()) {
-                List<ContentHit> queryTermResults = queryResult.get(termResult);
-
-                //translate to list of IDs that we keep track of
-                List<Long> queryTermResultsIDs = new ArrayList<>();
-                for (ContentHit ch : queryTermResults) {
-                    queryTermResultsIDs.add(ch.getId());
-                }
-
-                Keyword termResultK = new Keyword(termResult, !isRegex);
-                List<Long> curTermResults = currentResults.get(termResultK);
-                if (curTermResults == null) {
-                    currentResults.put(termResultK, queryTermResultsIDs);
-                    newResults.put(termResultK, queryTermResults);
-                } else {
-                    //some AbstractFile hits already exist for this keyword
-                    for (ContentHit res : queryTermResults) {
-                        if (!curTermResults.contains(res.getId())) {
-                            //add to new results
-                            List<ContentHit> newResultsFs = newResults.get(termResultK);
-                            if (newResultsFs == null) {
-                                newResultsFs = new ArrayList<>();
-                                newResults.put(termResultK, newResultsFs);
-                            }
-                            newResultsFs.add(res);
-                            curTermResults.add(res.getId());
-                        }
-                    }
-                }
-            }
-
-            return newResults;
-
-        }
-    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
index cb2629ae11..5576e62923 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form
@@ -3,7 +3,7 @@
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[200, 0]"/>
+      <Dimension value="[250, 0]"/>
     </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
       <Dimension value="[250, 492]"/>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
index 83348f6bd3..41f6c7665a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
@@ -97,7 +97,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
         importButton = new javax.swing.JButton();
         keywordListsLabel = new javax.swing.JLabel();
 
-        setMinimumSize(new java.awt.Dimension(200, 0));
+        setMinimumSize(new java.awt.Dimension(250, 0));
         setPreferredSize(new java.awt.Dimension(250, 492));
 
         jScrollPane1.setPreferredSize(new java.awt.Dimension(200, 402));
@@ -146,7 +146,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
                                 .addComponent(newListButton, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addGap(18, 18, 18)
                                 .addComponent(importButton, javax.swing.GroupLayout.PREFERRED_SIZE, 126, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                        .addGap(0, 4, Short.MAX_VALUE)))
+                        .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
index de6d93a918..8464a1ecc5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.awt.Component;
 import java.awt.Cursor;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -114,26 +115,23 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
             }
         });
 
-        if (IngestManager.getInstance().isIngestRunning()) {
-            initIngest(true);
-        } else {
-            initIngest(false);
-        }
+        ingestRunning = IngestManager.getInstance().isIngestRunning();
+        updateComponents();
 
         IngestManager.addPropertyChangeListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 String changed = evt.getPropertyName();
-                Object oldValue = evt.getOldValue();
-                if (changed.equals(IngestEvent.COMPLETED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(false);
-                } else if (changed.equals(IngestEvent.STARTED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(true);
-                } else if (changed.equals(IngestEvent.STOPPED.toString())
-                        && ((String) oldValue).equals(KeywordSearchModuleFactory.getModuleName())) {
-                    initIngest(false);
+                if (changed.equals(IngestEvent.INGEST_JOB_STARTED.toString())
+                        || changed.equals(IngestEvent.INGEST_JOB_COMPLETED.toString())
+                        || changed.equals(IngestEvent.INGEST_JOB_CANCELLED.toString())) {
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            ingestRunning = IngestManager.getInstance().isIngestRunning();
+                            updateComponents();
+                        }
+                    });                                
                 }
             }
         });
@@ -141,7 +139,8 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
         searchAddListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (ingestRunning) {
+                if (ingestRunning) {                    
+                    SearchRunner.getInstance().addKeywordListsToAllJobs(listsTableModel.getSelectedLists());
                     logger.log(Level.INFO, "Submitted enqueued lists to ingest");
                 } else {
                     searchAction(e);
@@ -152,28 +151,21 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
         searchAddButton.addActionListener(searchAddListener);
     }
 
-    /**
-     * Initialize this panel depending on whether ingest is running
-     *
-     * @param running case 0: ingest running case 1: ingest not running
-     */
-    private void initIngest(boolean running) {
-        if (running) {
-            ingestRunning = true;
+    private void updateComponents() {
+        ingestRunning = IngestManager.getInstance().isIngestRunning();
+        if (ingestRunning) {
             searchAddButton.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIngestTitle"));
             searchAddButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIngestMsg" ));
-            listsTableModel.resync();
             
         } else {
-            ingestRunning = false;
             searchAddButton.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.searchIngestTitle"));
             searchAddButton.setToolTipText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg"));
-            listsTableModel.resync();
         }
-        updateIngestIndexLabel(running);
+        listsTableModel.resync();
+        updateIngestIndexLabel();
     }
     
-    private void updateIngestIndexLabel(boolean ingestRunning) {
+    private void updateIngestIndexLabel() {
         if (ingestRunning) {
             ingestIndexLabel.setText(NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg", filesIndexed));
         }
@@ -184,7 +176,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
     
     @Override
     protected void postFilesIndexedChange() {
-         updateIngestIndexLabel(ingestRunning);
+         updateIngestIndexLabel();
     }
 
     /**
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
index 6a6bd9fc87..929ec49ac3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
@@ -66,7 +66,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
      * RJCTODO: Move this one to the manager
      * @return 
      */
-    static KeywordSearchListsXML getCurrent() {
+    static synchronized KeywordSearchListsXML getCurrent() {
         if (currentInstance == null) {
             currentInstance = new KeywordSearchListsXML(CUR_LISTS_FILE);
             currentInstance.reload();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
new file mode 100644
index 0000000000..813c0fd8dd
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
@@ -0,0 +1,713 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011 - 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sleuthkit.autopsy.keywordsearch;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
+import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
+import org.netbeans.api.progress.aggregate.ProgressContributor;
+import org.openide.util.Cancellable;
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.EscapeUtil;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.StopWatch;
+import org.sleuthkit.autopsy.ingest.IngestMessage;
+import org.sleuthkit.autopsy.ingest.IngestServices;
+import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.datamodel.BlackboardAttribute;
+
+/**
+ * Singleton keyword search manager:
+ * Launches search threads for each job and performs commits, both on timed 
+ * intervals.
+ */
+public final class SearchRunner {
+    private static final Logger logger = Logger.getLogger(SearchRunner.class.getName());
+    private static SearchRunner instance = null;
+    private IngestServices services = IngestServices.getInstance();
+    private Ingester ingester = null;  //guarded by "ingester"    
+    private volatile boolean updateTimerRunning = false;
+    private Timer updateTimer;
+    private Map<Long, SearchJobInfo> jobs = new HashMap<>(); //guarded by "this"
+    
+    SearchRunner() {
+        ingester = Server.getIngester();       
+        updateTimer = new Timer("SearchRunner update timer", true); // run as a daemon
+    }
+    
+    /**
+     *
+     * @return the singleton object
+     */
+    public static synchronized SearchRunner getInstance() {
+        if (instance == null) {
+            instance = new SearchRunner();
+        }
+        return instance;
+    }
+    
+    /**
+     *
+     * @param jobId
+     * @param dataSourceId
+     * @param keywordListNames
+     */
+    public synchronized void startJob(long jobId, long dataSourceId, List<String> keywordListNames) {
+        if (!jobs.containsKey(jobId)) {
+            logger.log(Level.INFO, "Adding job {0}", jobId);
+            SearchJobInfo jobData = new SearchJobInfo(jobId, dataSourceId, keywordListNames);
+            jobs.put(jobId, jobData);         
+        }
+        
+        jobs.get(jobId).incrementModuleReferenceCount();
+        
+        if (jobs.size() > 0) {
+            final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000;
+            if (!updateTimerRunning) {
+                updateTimer.scheduleAtFixedRate(new UpdateTimerTask(), updateIntervalMs, updateIntervalMs);
+                updateTimerRunning = true;
+            }
+        }
+    }
+    
+    /**
+     * Perform normal finishing of searching for this job, including one last
+     * commit and search. Blocks until the final search is complete.
+     * @param jobId
+     */
+    public void endJob(long jobId) {        
+        SearchJobInfo job;
+        boolean readyForFinalSearch = false;
+        synchronized(this) {
+            job = jobs.get(jobId);
+            if (job == null) {
+                return;
+            }
+            
+            // Only do final search if this is the last module in this job to call endJob()
+            if(job.decrementModuleReferenceCount() == 0) {
+                jobs.remove(jobId);
+                readyForFinalSearch = true;
+            }
+        }                  
+        
+        if (readyForFinalSearch) {          
+            commit();        
+            doFinalSearch(job); //this will block until it's done
+        }
+    }
+    
+    
+    /**
+     * Immediate stop and removal of job from SearchRunner. Cancels the 
+     * associated search worker if it's still running.
+     * @param jobId
+     */
+    public void stopJob(long jobId) {
+        logger.log(Level.INFO, "Stopping job {0}", jobId);
+        commit(); 
+
+        SearchJobInfo job;
+        synchronized(this) {
+            job = jobs.get(jobId);
+            if (job == null) {
+                return;
+            }
+            
+            //stop currentSearcher
+            SearchRunner.Searcher currentSearcher = job.getCurrentSearcher();
+            if ((currentSearcher != null) && (!currentSearcher.isDone())) {
+                currentSearcher.cancel(true);
+            }            
+            
+            jobs.remove(jobId);
+        }        
+    }
+    
+    /**
+     * Add these lists to all of the jobs
+     * @param keywordListName 
+     */
+    public synchronized void addKeywordListsToAllJobs(List<String> keywordListNames) {
+        for(String listName : keywordListNames) {
+            logger.log(Level.INFO, "Adding keyword list {0} to all jobs", listName);
+            for(SearchJobInfo j : jobs.values()) {
+                j.addKeywordListName(listName);
+            }
+        }
+    }
+    
+    /**
+     * Commits index and notifies listeners of index update
+     */
+    private void commit() {
+        synchronized(ingester) {
+            ingester.commit();
+        }
+
+        // Signal a potential change in number of text_ingested files
+        try {
+            final int numIndexedFiles = KeywordSearch.getServer().queryNumIndexedFiles();
+            KeywordSearch.fireNumIndexedFilesChange(null, new Integer(numIndexedFiles));
+        } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
+            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files: ", ex);
+        }
+    }    
+    
+    /**
+     * A final search waits for any still-running workers, and then executes a
+     * new one and waits until that is done.
+     * @param job 
+     */
+    private void doFinalSearch(SearchJobInfo job) {
+        // Run one last search as there are probably some new files committed
+        logger.log(Level.INFO, "Running final search for jobid {0}", job.getJobId());        
+        if (!job.getKeywordListNames().isEmpty()) {
+            try {
+                // In case this job still has a worker running, wait for it to finish
+                job.waitForCurrentWorker();
+
+                SearchRunner.Searcher finalSearcher = new SearchRunner.Searcher(job, true);
+                job.setCurrentSearcher(finalSearcher); //save the ref
+                finalSearcher.execute(); //start thread
+                
+                // block until the search is complete
+                finalSearcher.get();
+                
+            } catch (InterruptedException | ExecutionException ex) {
+                logger.log(Level.WARNING, "Job {1} final search thread failed: {2}", new Object[]{job.getJobId(), ex});
+            }
+        }
+    }
+    
+   
+    /**
+     * Timer triggered re-search for each job (does a single index commit first)
+     */
+    private class UpdateTimerTask extends TimerTask {
+        private final Logger logger = Logger.getLogger(SearchRunner.UpdateTimerTask.class.getName());
+
+        @Override
+        public void run() {
+            // If no jobs then cancel the task. If more job(s) come along, a new task will start up.
+            if (jobs.isEmpty()) {
+                this.cancel(); //terminate this timer task
+                updateTimerRunning = false;
+                return;
+            }
+            
+            commit();
+
+            synchronized(SearchRunner.this) {
+                // Spawn a search thread for each job
+                for(Entry<Long, SearchJobInfo> j : jobs.entrySet()) {
+                    SearchJobInfo job = j.getValue();
+                    // If no lists or the worker is already running then skip it
+                    if (!job.getKeywordListNames().isEmpty() && !job.isWorkerRunning()) {
+                        Searcher searcher = new Searcher(job);
+                        job.setCurrentSearcher(searcher); //save the ref
+                        searcher.execute(); //start thread
+                        job.setWorkerRunning(true);
+                    }
+                }
+            }
+        }
+    }    
+    
+    /**
+     * Data structure to keep track of keyword lists, current results, and search
+     * running status for each jobid
+     */
+    private class SearchJobInfo {
+        private final long jobId;
+        private final long dataSourceId;
+        // mutable state:
+        private volatile boolean workerRunning;
+        private List<String> keywordListNames; //guarded by SearchJobInfo.this
+        private Map<Keyword, List<Long>> currentResults; //guarded by SearchJobInfo.this
+        private SearchRunner.Searcher currentSearcher;
+        private AtomicLong moduleReferenceCount = new AtomicLong(0);
+        private final Object finalSearchLock = new Object(); //used for a condition wait
+
+        public SearchJobInfo(long jobId, long dataSourceId, List<String> keywordListNames) {
+            this.jobId = jobId;
+            this.dataSourceId = dataSourceId;
+            this.keywordListNames = new ArrayList<>(keywordListNames);
+            currentResults = new HashMap<>();
+            workerRunning = false;
+            currentSearcher = null;
+        }
+              
+        public long getJobId() {
+            return jobId;
+        }
+        
+        public long getDataSourceId() {
+            return dataSourceId;
+        }
+        
+        public synchronized List<String> getKeywordListNames() {
+            return new ArrayList<>(keywordListNames);
+        }
+        
+        public synchronized void addKeywordListName(String keywordListName) {
+            if (!keywordListNames.contains(keywordListName)) {
+                keywordListNames.add(keywordListName);
+            }
+        }
+        
+        public synchronized List<Long> currentKeywordResults(Keyword k) {
+            return currentResults.get(k);
+        }
+
+        public synchronized void addKeywordResults(Keyword k, List<Long> resultsIDs) {
+            currentResults.put(k, resultsIDs);
+        }
+        
+        public boolean isWorkerRunning() {
+            return workerRunning;
+        }
+        
+        public void setWorkerRunning(boolean flag) {
+            workerRunning = flag;           
+        }
+        
+        public synchronized SearchRunner.Searcher getCurrentSearcher() {
+            return currentSearcher;
+        }
+        
+        public synchronized void setCurrentSearcher(SearchRunner.Searcher searchRunner) {
+            currentSearcher = searchRunner;
+        }
+        
+        public void incrementModuleReferenceCount() {
+            moduleReferenceCount.incrementAndGet();
+        }
+        
+        public long decrementModuleReferenceCount() {
+            return moduleReferenceCount.decrementAndGet();
+        }
+        
+        /** In case this job still has a worker running, wait for it to finish
+         * 
+         * @throws InterruptedException 
+         */
+        public void waitForCurrentWorker() throws InterruptedException {            
+            synchronized(finalSearchLock) {
+                while(workerRunning) {
+                    finalSearchLock.wait(); //wait() releases the lock
+                }
+            }
+        }
+        
+        /**
+         * Unset workerRunning and wake up thread(s) waiting on finalSearchLock 
+         */
+        public void searchNotify() {
+            synchronized(finalSearchLock) {                        
+                workerRunning = false;
+                finalSearchLock.notify();
+            }
+        }
+    }
+    
+    /**
+     * Searcher responsible for searching the current index and writing results
+     * to blackboard and the inbox. Also, posts results to listeners as Ingest
+     * data events. Searches entire index, and keeps track of only new results
+     * to report and save. Runs as a background thread.
+     */
+    private final class Searcher extends SwingWorker<Object, Void> {
+
+        /**
+         * Searcher has private copies/snapshots of the lists and keywords
+         */
+        private SearchJobInfo job;
+        private List<Keyword> keywords; //keywords to search
+        private List<String> keywordListNames; // lists currently being searched
+        private Map<String, KeywordList> keywordToList; //keyword to list name mapping
+        private AggregateProgressHandle progressGroup;
+        private final Logger logger = Logger.getLogger(SearchRunner.Searcher.class.getName());
+        private boolean finalRun = false;
+
+        Searcher(SearchJobInfo job) {
+            this.job = job;
+            keywordListNames = job.getKeywordListNames();
+            keywords = new ArrayList<>();
+            keywordToList = new HashMap<>();
+            //keywords are populated as searcher runs
+        }
+
+        Searcher(SearchJobInfo job, boolean finalRun) {
+            this(job);
+            this.finalRun = finalRun;
+        }
+
+        @Override
+        protected Object doInBackground() throws Exception {
+            final String displayName = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.displayName")
+                    + (finalRun ? (" - " + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.finalizeMsg")) : "");
+            final String pgDisplayName = displayName + (" (" + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.doInBackGround.pendingMsg") + ")");
+            progressGroup = AggregateProgressFactory.createSystemHandle(pgDisplayName, null, new Cancellable() {
+                @Override
+                public boolean cancel() {
+                    logger.log(Level.INFO, "Cancelling the searcher by user.");
+                    if (progressGroup != null) {
+                        progressGroup.setDisplayName(displayName + " (" + NbBundle.getMessage(this.getClass(), "SearchRunner.doInBackGround.cancelMsg") + "...)");
+                    }
+                    return SearchRunner.Searcher.this.cancel(true);
+                }
+            }, null);
+
+            updateKeywords();
+
+            ProgressContributor[] subProgresses = new ProgressContributor[keywords.size()];
+            int i = 0;
+            for (Keyword keywordQuery : keywords) {
+                subProgresses[i] = AggregateProgressFactory.createProgressContributor(keywordQuery.getQuery());
+                progressGroup.addContributor(subProgresses[i]);
+                i++;
+            }
+
+            progressGroup.start();
+
+            final StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
+            try {
+                progressGroup.setDisplayName(displayName);
+
+                int keywordsSearched = 0;
+
+                for (Keyword keywordQuery : keywords) {
+                    if (this.isCancelled()) {
+                        logger.log(Level.INFO, "Cancel detected, bailing before new keyword processed: {0}", keywordQuery.getQuery());
+                        return null;
+                    }
+
+                    final String queryStr = keywordQuery.getQuery();
+                    final KeywordList list = keywordToList.get(queryStr);
+                    final String listName = list.getName();
+
+                    //new subProgress will be active after the initial query
+                    //when we know number of hits to start() with
+                    if (keywordsSearched > 0) {
+                        subProgresses[keywordsSearched - 1].finish();
+                    }
+
+                    KeywordSearchQuery del = null;
+
+                    boolean isRegex = !keywordQuery.isLiteral();
+                    if (isRegex) {
+                        del = new TermComponentQuery(keywordQuery);
+                    } else {
+                        del = new LuceneQuery(keywordQuery);
+                        del.escape();
+                    }
+
+                    //limit search to currently ingested data sources
+                    //set up a filter with 1 or more image ids OR'ed
+                    final KeywordQueryFilter dataSourceFilter = new KeywordQueryFilter(KeywordQueryFilter.FilterType.DATA_SOURCE, job.getDataSourceId());
+                    del.addFilter(dataSourceFilter);
+
+                    Map<String, List<ContentHit>> queryResult;
+
+                    try {
+                        queryResult = del.performQuery();
+                    } catch (NoOpenCoreException ex) {
+                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), ex);
+                        //no reason to continue with next query if recovery failed
+                        //or wait for recovery to kick in and run again later
+                        //likely case has closed and threads are being interrupted
+                        return null;
+                    } catch (CancellationException e) {
+                        logger.log(Level.INFO, "Cancel detected, bailing during keyword query: {0}", keywordQuery.getQuery());
+                        return null;
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), e);
+                        continue;
+                    }
+
+                    // calculate new results by substracting results already obtained in this ingest
+                    // this creates a map of each keyword to the list of unique files that have that hit.  
+                    Map<Keyword, List<ContentHit>> newResults = filterResults(queryResult, isRegex);
+
+                    if (!newResults.isEmpty()) {
+
+                        //write results to BB
+
+                        //new artifacts created, to report to listeners
+                        Collection<BlackboardArtifact> newArtifacts = new ArrayList<>();
+
+                        //scale progress bar more more granular, per result sub-progress, within per keyword
+                        int totalUnits = newResults.size();
+                        subProgresses[keywordsSearched].start(totalUnits);
+                        int unitProgress = 0;
+                        String queryDisplayStr = keywordQuery.getQuery();
+                        if (queryDisplayStr.length() > 50) {
+                            queryDisplayStr = queryDisplayStr.substring(0, 49) + "...";
+                        }
+                        subProgresses[keywordsSearched].progress(listName + ": " + queryDisplayStr, unitProgress);
+
+                        // cycle through the keywords returned -- only one unless it was a regexp
+                        for (final Keyword hitTerm : newResults.keySet()) {
+                            //checking for cancellation between results
+                            if (this.isCancelled()) {
+                                logger.log(Level.INFO, "Cancel detected, bailing before new hit processed for query: {0}", keywordQuery.getQuery());
+                                return null;
+                            }
+
+                            // update progress display
+                            String hitDisplayStr = hitTerm.getQuery();
+                            if (hitDisplayStr.length() > 50) {
+                                hitDisplayStr = hitDisplayStr.substring(0, 49) + "...";
+                            }
+                            subProgresses[keywordsSearched].progress(listName + ": " + hitDisplayStr, unitProgress);
+
+                            // this returns the unique files in the set with the first chunk that has a hit
+                            Map<AbstractFile, Integer> contentHitsFlattened = ContentHit.flattenResults(newResults.get(hitTerm));
+                            for (final AbstractFile hitFile : contentHitsFlattened.keySet()) {
+
+                                // get the snippet for the first hit in the file
+                                String snippet;
+                                final String snippetQuery = KeywordSearchUtil.escapeLuceneQuery(hitTerm.getQuery());
+                                int chunkId = contentHitsFlattened.get(hitFile);
+                                try {
+                                    snippet = LuceneQuery.querySnippet(snippetQuery, hitFile.getId(), chunkId, isRegex, true);
+                                } catch (NoOpenCoreException e) {
+                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                                    //no reason to continue
+                                    return null;
+                                } catch (Exception e) {
+                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                                    continue;
+                                }
+
+                                // write the blackboard artifact for this keyword in this file
+                                KeywordWriteResult written = del.writeToBlackBoard(hitTerm.getQuery(), hitFile, snippet, listName);
+                                if (written == null) {
+                                    logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hitFile, hitTerm.toString()});
+                                    continue;
+                                }
+
+                                newArtifacts.add(written.getArtifact());
+
+                                //generate an ingest inbox message for this keyword in this file
+                                if (list.getIngestMessages()) {
+                                    StringBuilder subjectSb = new StringBuilder();
+                                    StringBuilder detailsSb = new StringBuilder();
+
+                                    if (!keywordQuery.isLiteral()) {
+                                        subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExpHitLbl"));
+                                    } else {
+                                        subjectSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitLbl"));
+                                    }
+                                    String uniqueKey = null;
+                                    BlackboardAttribute attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID());
+                                    if (attr != null) {
+                                        final String keyword = attr.getValueString();
+                                        subjectSb.append(keyword);
+                                        uniqueKey = keyword.toLowerCase();
+                                    }
+
+                                    //details
+                                    detailsSb.append("<table border='0' cellpadding='4' width='280'>");
+                                    //hit
+                                    detailsSb.append("<tr>");
+                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitThLbl"));
+                                    detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
+                                    detailsSb.append("</tr>");
+
+                                    //preview
+                                    attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID());
+                                    if (attr != null) {
+                                        detailsSb.append("<tr>");
+                                        detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.previewThLbl"));
+                                        detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
+                                        detailsSb.append("</tr>");
+                                    }
+
+                                    //file
+                                    detailsSb.append("<tr>");
+                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.fileThLbl"));
+                                    detailsSb.append("<td>").append(hitFile.getParentPath()).append(hitFile.getName()).append("</td>");
+                                    detailsSb.append("</tr>");
+
+                                    //list
+                                    attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID());
+                                    detailsSb.append("<tr>");
+                                    detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.listThLbl"));
+                                    detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
+                                    detailsSb.append("</tr>");
+
+                                    //regex
+                                    if (!keywordQuery.isLiteral()) {
+                                        attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID());
+                                        if (attr != null) {
+                                            detailsSb.append("<tr>");
+                                            detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExThLbl"));
+                                            detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
+                                            detailsSb.append("</tr>");
+                                        }
+                                    }
+                                    detailsSb.append("</table>");
+
+                                    services.postMessage(IngestMessage.createDataMessage(KeywordSearchModuleFactory.getModuleName(), subjectSb.toString(), detailsSb.toString(), uniqueKey, written.getArtifact()));
+                                }
+                            } //for each file hit
+
+                            ++unitProgress;
+
+                        }//for each hit term
+
+                        //update artifact browser
+                        if (!newArtifacts.isEmpty()) {
+                            services.fireModuleDataEvent(new ModuleDataEvent(KeywordSearchModuleFactory.getModuleName(), BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT, newArtifacts));
+                        }
+                    } //if has results
+
+                    //reset the status text before it goes away
+                    subProgresses[keywordsSearched].progress("");
+
+                    ++keywordsSearched;
+
+                } //for each keyword
+
+            } //end try block
+            catch (Exception ex) {
+                logger.log(Level.WARNING, "searcher exception occurred", ex);
+            } finally {
+                try {
+                    finalizeSearcher();
+                    stopWatch.stop();                   
+                    
+                    logger.log(Level.INFO, "Searcher took to run: {0} secs.", stopWatch.getElapsedTimeSecs());
+                } finally {
+                    // In case a thread is waiting on this worker to be done
+                    job.searchNotify();
+                }
+            }
+
+            return null;
+        }
+
+        @Override
+        protected void done() {
+            // call get to see if there were any errors
+            try {
+                get();
+            } catch (InterruptedException | ExecutionException e) {
+                logger.log(Level.SEVERE, "Error performing keyword search: " + e.getMessage());
+                services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), "Error performing keyword search", e.getMessage()));
+            } // catch and ignore if we were cancelled
+            catch (java.util.concurrent.CancellationException ex) {
+            }
+        }
+
+        /**
+         * Sync-up the updated keywords from the currently used lists in the XML
+         */
+        private void updateKeywords() {
+            KeywordSearchListsXML loader = KeywordSearchListsXML.getCurrent();
+
+            keywords.clear();
+            keywordToList.clear();
+            
+
+            for (String name : keywordListNames) {
+                KeywordList list = loader.getList(name);
+                for (Keyword k : list.getKeywords()) {
+                    this.keywords.add(k);
+                    this.keywordToList.put(k.getQuery(), list);
+                }
+            }
+        }
+
+        /**
+         * Performs the cleanup that needs to be done right AFTER
+         * doInBackground() returns without relying on done() method that is not
+         * guaranteed to run.
+         */
+        private void finalizeSearcher() {
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    progressGroup.finish();
+                }
+            });
+        }
+
+        //calculate new results but substracting results already obtained in this ingest
+        //update currentResults map with the new results
+        private Map<Keyword, List<ContentHit>> filterResults(Map<String, List<ContentHit>> queryResult, boolean isRegex) {
+            Map<Keyword, List<ContentHit>> newResults = new HashMap<>();
+
+            for (String termResult : queryResult.keySet()) {
+                List<ContentHit> queryTermResults = queryResult.get(termResult);
+
+                //translate to list of IDs that we keep track of
+                List<Long> queryTermResultsIDs = new ArrayList<>();
+                for (ContentHit ch : queryTermResults) {
+                    queryTermResultsIDs.add(ch.getId());
+                }
+
+                Keyword termResultK = new Keyword(termResult, !isRegex);
+                List<Long> curTermResults = job.currentKeywordResults(termResultK);
+                if (curTermResults == null) {
+                    job.addKeywordResults(termResultK, queryTermResultsIDs);
+                    newResults.put(termResultK, queryTermResults);
+                } else {
+                    //some AbstractFile hits already exist for this keyword
+                    for (ContentHit res : queryTermResults) {
+                        if (!curTermResults.contains(res.getId())) {
+                            //add to new results
+                            List<ContentHit> newResultsFs = newResults.get(termResultK);
+                            if (newResultsFs == null) {
+                                newResultsFs = new ArrayList<>();
+                                newResults.put(termResultK, newResultsFs);
+                            }
+                            newResultsFs.add(res);
+                            curTermResults.add(res.getId());
+                        }
+                    }
+                }
+            }
+
+            return newResults;
+
+        }        
+        
+    }    
+    
+}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 676ff39ee8..5b3baa041f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -385,9 +385,9 @@ public class Server {
                 logger.log(Level.INFO, "Finished starting Solr");
 
                 try {
-                    //block, give time to fully start the process
+                    //block for 10 seconds, give time to fully start the process
                     //so if it's restarted solr operations can be resumed seamlessly
-                    Thread.sleep(10000);
+                    Thread.sleep(10 * 1000);
                 } catch (InterruptedException ex) {
                     logger.log(Level.WARNING, "Timer interrupted");
                 }
@@ -398,19 +398,17 @@ public class Server {
 
                 final List<Long> pids = this.getSolrPIDs();
                 logger.log(Level.INFO, "New Solr process PID: " + pids);
-
-
             } catch (SecurityException ex) {
-                logger.log(Level.WARNING, "Could not start Solr process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr process!", ex);
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg"), ex);
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Could not start Solr server process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr server process!", ex);
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg2"), ex);
             }
         } else {
-            logger.log(Level.WARNING, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
+            logger.log(Level.SEVERE, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
             throw new SolrServerNoPortException(currentSolrServerPort);
         }
     }
diff --git a/RecentActivity/release/rr-full/plugins/lsasecrets.pl b/RecentActivity/release/rr-full/plugins/lsasecrets.pl
index 399ba6519e..c4b195432e 100755
--- a/RecentActivity/release/rr-full/plugins/lsasecrets.pl
+++ b/RecentActivity/release/rr-full/plugins/lsasecrets.pl
@@ -49,23 +49,30 @@ sub pluginmain {
 		eval {
 			::rptMsg("");
 			::rptMsg("Domain secret - \$MACHINE\.ACC");
-			my $c = $key->get_subkey("\$MACHINE\.ACC\\CupdTime")->get_value("")->get_data();
-			my @v = unpack("VV",$c);
-			my $cupd = gmtime(::getTime($v[0],$v[1]));
-			::rptMsg("CupdTime = ".$cupd);
+			my $v1 = $key->get_subkey("\$MACHINE\.ACC\\CupdTime")->get_value("");
+                        if (defined $v1) {
+                            my $c = $v1->get_data();
+                            my @v = unpack("VV",$c);
+                            my $cupd = gmtime(::getTime($v[0],$v[1]));
+                            ::rptMsg("CupdTime = ".$cupd);
+                        }
+                        else {
+                            ::rptMsg("CupdTime value not found");
+                        }
 			
-			my $o = $key->get_subkey("\$MACHINE\.ACC\\OupdTime")->get_value("")->get_data();
-			my @v = unpack("VV",$c);
-			my $oupd = gmtime(::getTime($v[0],$v[1]));
-			::rptMsg("OupdTime = ".$oupd);
+			
+			$v1 = $key->get_subkey("\$MACHINE\.ACC\\OupdTime")->get_value("")
+                        if (defined $v1) {
+                            my $c = $v1->get_data();
+                            my @v = unpack("VV",$c);
+                            my $oupd = gmtime(::getTime($v[0],$v[1]));
+                            ::rptMsg("OupdTime = ".$oupd);
+                        }
+                        else {
+                            ::rptMsg("OupdTime value not found");
+                        }
 		};
 		::rptMsg("Error: ".$@) if ($@);
-		
-		
-		
-		
-		
-		
 	}
 	else {
 		::rptMsg($key_path." not found.");
diff --git a/RecentActivity/release/rr-full/plugins/productpolicy.pl b/RecentActivity/release/rr-full/plugins/productpolicy.pl
index 80948e1ff2..daf4b96acf 100755
--- a/RecentActivity/release/rr-full/plugins/productpolicy.pl
+++ b/RecentActivity/release/rr-full/plugins/productpolicy.pl
@@ -69,29 +69,32 @@ sub pluginmain {
 	my $key;
 	my $key_path = "ControlSet00".$curr."\\Control\\ProductOptions";
 	if ($key = $root_key->get_subkey($key_path)) {
-		my $prod;
 		eval {
-			$prod = $key->get_value("ProductPolicy")->get_data();
+			my $v1 = $key->get_value("ProductPolicy");
+                        if (defined $v1) {
+                            my $prod = $v1->get_data();
+                            my %pol = parseData($prod);	
+                            ::rptMsg("");
+                            ::rptMsg("Note: This plugin applies to Vista and Windows 2008 ONLY.");
+                            ::rptMsg("For a listing of names and values, see:");
+                            ::rptMsg("http://www.geoffchappell.com/viewer.htm?doc=notes/windows/license/install.htm&tx=3,5,6;4");
+                            ::rptMsg("");	
+                            foreach my $p (sort keys %pol) {
+                                    ::rptMsg($p." - ".$pol{$p});
+                            }
+
+                            if (exists $prodinfo{$pol{"Kernel\-ProductInfo"}}) {
+                                    ::rptMsg("");
+                                    ::rptMsg("Kernel\-ProductInfo = ".$prodinfo{$pol{"Kernel\-ProductInfo"}});
+                            }
+                        }
+                        else {
+                            ::rptMsg("Error getting ProductPolicy value");
+                        }
 		};
 		if ($@) {
 			::rptMsg("Error getting ProductPolicy value: $@");
 		}
-		else {	
-			my %pol = parseData($prod);	
-			::rptMsg("");
-			::rptMsg("Note: This plugin applies to Vista and Windows 2008 ONLY.");
-			::rptMsg("For a listing of names and values, see:");
-			::rptMsg("http://www.geoffchappell.com/viewer.htm?doc=notes/windows/license/install.htm&tx=3,5,6;4");
-			::rptMsg("");	
-			foreach my $p (sort keys %pol) {
-				::rptMsg($p." - ".$pol{$p});
-			}
-			
-			if (exists $prodinfo{$pol{"Kernel\-ProductInfo"}}) {
-				::rptMsg("");
-				::rptMsg("Kernel\-ProductInfo = ".$prodinfo{$pol{"Kernel\-ProductInfo"}});
-			}
-		}
 	}
 	else {
 		::rptMsg($key_path." not found.");
diff --git a/RecentActivity/release/rr-full/plugins/skype.pl b/RecentActivity/release/rr-full/plugins/skype.pl
index 3c83bc65f1..aac6de219c 100755
--- a/RecentActivity/release/rr-full/plugins/skype.pl
+++ b/RecentActivity/release/rr-full/plugins/skype.pl
@@ -45,13 +45,17 @@ sub pluginmain {
 		::rptMsg("LastWrite Time ".gmtime($key->get_timestamp())." (UTC)");
 		::rptMsg("");
 		
-		my $install;
 		eval {
-			$install = $key->get_subkey("Installer")->get_value("DonwloadLastModified")->get_data();
-			::rptMsg("DonwloadLastModified = ".$install);
+			my $v1 = $install = $key->get_subkey("Installer")->get_value("DonwloadLastModified");
+                        if (defined $v1) {
+                            my $install = $v1->get_data()
+                            ::rptMsg("DonwloadLastModified = ".$install);
+                        }
+                        else {
+                            ::rptMsg("DonwloadLastModified value not found");
+                        }
 		};
 		::rptMsg("DonwloadLastModified value not found: ".$@) if ($@);
-		
 	}
 	else {
 		::rptMsg($key_path." not found.");
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
index 8554fe04a7..b0b8cae007 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
@@ -39,7 +39,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -62,27 +62,29 @@ class Chrome extends Extract {
     private static final String downloadQueryVersion30 = "SELECT current_path as full_path, url, start_time, received_bytes FROM downloads, downloads_url_chains WHERE downloads.id=downloads_url_chains.id";
     private static final String loginQuery = "select origin_url, username_value, signon_realm from logins";
     private final Logger logger = Logger.getLogger(this.getClass().getName());
+    private Content dataSource;
+    private IngestJobContext context;
 
     Chrome() {
         moduleName = NbBundle.getMessage(Chrome.class, "Chrome.moduleName");
     }
 
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper statusHelper) {
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
         dataFound = false;
-        this.getHistory(dataSource, statusHelper);
-        this.getBookmark(dataSource, statusHelper);
-        this.getCookie(dataSource, statusHelper);
-        this.getLogin(dataSource, statusHelper);
-        this.getDownload(dataSource, statusHelper);
+        this.getHistory();
+        this.getBookmark();
+        this.getCookie();
+        this.getLogin();
+        this.getDownload();
     }
 
     /**
      * Query for history databases and add artifacts
-     * @param dataSource
-     * @param controller 
      */
-    private void getHistory(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getHistory() {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> historyFiles;
         try {
@@ -126,7 +128,7 @@ class Chrome extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
@@ -164,10 +166,8 @@ class Chrome extends Extract {
 
     /**
      * Search for bookmark files and make artifacts.
-     * @param dataSource
-     * @param controller 
      */
-    private void getBookmark(Content dataSource, DataSourceIngestModuleStatusHelper controller) {     
+    private void getBookmark() {     
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> bookmarkFiles = null;
         try {
@@ -204,7 +204,7 @@ class Chrome extends Extract {
             
             logger.log(Level.INFO, "{0}- Now getting Bookmarks from {1}", new Object[]{moduleName, temps});
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
@@ -305,10 +305,8 @@ class Chrome extends Extract {
 
     /**
      * Queries for cookie files and adds artifacts
-     * @param dataSource
-     * @param controller 
      */
-    private void getCookie(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getCookie() {
         
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> cookiesFiles;
@@ -344,7 +342,7 @@ class Chrome extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
@@ -383,10 +381,8 @@ class Chrome extends Extract {
 
     /**
      * Queries for download files and adds artifacts
-     * @param dataSource
-     * @param controller 
      */
-    private void getDownload(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getDownload() {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> downloadFiles = null;
         try {
@@ -420,7 +416,7 @@ class Chrome extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
@@ -473,10 +469,8 @@ class Chrome extends Extract {
 
     /**
      * Queries for login files and adds artifacts
-     * @param dataSource
-     * @param controller 
      */
-    private void getLogin(Content dataSource, DataSourceIngestModuleStatusHelper controller) {  
+    private void getLogin() {  
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> signonFiles;
         try {
@@ -511,7 +505,7 @@ class Chrome extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index a312d81739..7a22ac6a8c 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -32,7 +32,7 @@ import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException;
 import org.sleuthkit.datamodel.*;
 
@@ -40,7 +40,7 @@ abstract class Extract {
 
     protected Case currentCase = Case.getCurrentCase();
     protected SleuthkitCase tskCase = currentCase.getSleuthkitCase();
-    public final Logger logger = Logger.getLogger(this.getClass().getName());
+    private final Logger logger = Logger.getLogger(this.getClass().getName());
     private final ArrayList<String> errorMessages = new ArrayList<>();
     String moduleName = "";
     boolean dataFound = false;
@@ -51,7 +51,7 @@ abstract class Extract {
     void init() throws IngestModuleException {
     }
 
-    abstract void process(Content dataSource, DataSourceIngestModuleStatusHelper controller);
+    abstract void process(Content dataSource, IngestJobContext context);
 
     void complete() {
     }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
index b1168dba98..21875852ee 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
@@ -52,7 +52,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.datamodel.*;
 
 /**
@@ -66,6 +66,8 @@ class ExtractIE extends Extract {
     private String JAVA_PATH;    
     private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     private  ExecUtil execPasco;
+    private Content dataSource;
+    private IngestJobContext context;
 
     ExtractIE() {
         moduleName = NbBundle.getMessage(ExtractIE.class, "ExtractIE.moduleName.text");
@@ -74,19 +76,19 @@ class ExtractIE extends Extract {
     }
 
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
         dataFound = false;
-        this.getBookmark(dataSource, controller);
-        this.getCookie(dataSource, controller);
-        this.getHistory(dataSource, controller);
+        this.getBookmark();
+        this.getCookie();
+        this.getHistory();
     }
 
     /**
      * Finds the files storing bookmarks and creates artifacts
-     * @param dataSource
-     * @param controller 
      */
-    private void getBookmark(Content dataSource, DataSourceIngestModuleStatusHelper controller) {       
+    private void getBookmark() {       
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> favoritesFiles;
         try {
@@ -110,7 +112,7 @@ class ExtractIE extends Extract {
                 continue;
             }
          
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
             
@@ -180,10 +182,8 @@ class ExtractIE extends Extract {
 
     /**
      * Finds files that store cookies and adds artifacts for them. 
-     * @param dataSource
-     * @param controller 
      */
-    private void getCookie(Content dataSource, DataSourceIngestModuleStatusHelper controller) { 
+    private void getCookie() { 
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> cookiesFiles;
         try {
@@ -202,7 +202,7 @@ class ExtractIE extends Extract {
         
         dataFound = true;
         for (AbstractFile cookiesFile : cookiesFiles) {
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
             if (cookiesFile.getSize() == 0) {
@@ -257,11 +257,9 @@ class ExtractIE extends Extract {
 
     /**
      * Locates index.dat files, runs Pasco on them, and creates artifacts. 
-     * @param dataSource
-     * @param controller 
      */
-    private void getHistory(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        logger.log(Level.INFO, "Pasco results path: " + moduleTempResultsDir);
+    private void getHistory() {
+        logger.log(Level.INFO, "Pasco results path: {0}", moduleTempResultsDir);
         boolean foundHistory = false;
 
         final File pascoRoot = InstalledFileLocator.getDefault().locate("pasco2", ExtractIE.class.getPackage().getName(), false);
@@ -273,7 +271,7 @@ class ExtractIE extends Extract {
         } 
        
         final String pascoHome = pascoRoot.getAbsolutePath();
-        logger.log(Level.INFO, "Pasco2 home: " + pascoHome);
+        logger.log(Level.INFO, "Pasco2 home: {0}", pascoHome);
 
         PASCO_LIB_PATH = pascoHome + File.separator + "pasco2.jar" + File.pathSeparator
                 + pascoHome + File.separator + "*";
@@ -283,7 +281,7 @@ class ExtractIE extends Extract {
      
         // get index.dat files
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
-        List<AbstractFile> indexFiles = null;
+        List<AbstractFile> indexFiles;
         try {
             indexFiles = fileManager.findFiles(dataSource, "index.dat");
         } catch (TskCoreException ex) {
@@ -312,7 +310,7 @@ class ExtractIE extends Extract {
             //indexFileName = "index" + Long.toString(bbart.getArtifactID()) + ".dat";
             temps = RAImageIngestModule.getRATempPath(currentCase, "IE") + File.separator + indexFileName;
             File datFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
             try {
@@ -337,7 +335,7 @@ class ExtractIE extends Extract {
                 //Delete index<n>.dat file since it was succcessfully by Pasco
                 datFile.delete();
             } else {
-                logger.log(Level.WARNING, "pasco execution failed on: " + this.getName());
+                logger.log(Level.WARNING, "pasco execution failed on: {0}", this.getName());
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errProcHist", this.getName()));
             }
@@ -361,7 +359,7 @@ class ExtractIE extends Extract {
         Writer writer = null;
         try {
             final String outputFileFullPath = moduleTempResultsDir + File.separator + outputFileName;
-            logger.log(Level.INFO, "Writing pasco results to: " + outputFileFullPath);
+            logger.log(Level.INFO, "Writing pasco results to: {0}", outputFileFullPath);
             writer = new FileWriter(outputFileFullPath);
             execPasco = new ExecUtil();
             execPasco.execute(writer, JAVA_PATH, 
@@ -402,7 +400,7 @@ class ExtractIE extends Extract {
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.notFound", this.getName(),
                                         file.getName()));
-            logger.log(Level.WARNING, "Pasco Output not found: " + file.getPath());
+            logger.log(Level.WARNING, "Pasco Output not found: {0}", file.getPath());
             return;
         }
 
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 5a75e9fbca..2e3cadcde9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -37,8 +37,8 @@ import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
-import org.sleuthkit.autopsy.recentactivity.ExtractUSB.USBInfo;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
+import org.sleuthkit.autopsy.recentactivity.UsbDeviceIdMapper.USBInfo;
 import org.sleuthkit.datamodel.*;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
@@ -64,6 +64,8 @@ class ExtractRegistry extends Extract {
     private boolean rrFullFound = false; // true if we found the full version of regripper
     final private static String MODULE_VERSION = "1.0";
     private ExecUtil execRR;
+    private Content dataSource;
+    private IngestJobContext context;
 
     //hide public constructor to prevent from instantiation by ingest module loader
     ExtractRegistry() {
@@ -77,7 +79,7 @@ class ExtractRegistry extends Extract {
         }
         
         final String rrHome = rrRoot.getAbsolutePath();
-        logger.log(Level.INFO, "RegRipper home: " + rrHome);
+        logger.log(Level.INFO, "RegRipper home: {0}", rrHome);
 
         if (PlatformUtil.isWindowsOS()) {
             RR_PATH = rrHome + File.separator + "rip.exe";
@@ -94,7 +96,7 @@ class ExtractRegistry extends Extract {
         }
         
         final String rrFullHome = rrFullRoot.getAbsolutePath();
-        logger.log(Level.INFO, "RegRipper Full home: " + rrFullHome);
+        logger.log(Level.INFO, "RegRipper Full home: {0}", rrFullHome);
 
         if (PlatformUtil.isWindowsOS()) {
             RR_FULL_PATH = rrFullHome + File.separator + "rip.exe";
@@ -105,10 +107,8 @@ class ExtractRegistry extends Extract {
     
     /**
      * Search for the registry hives on the system.
-     * @param dataSource Data source to search for hives in.
-     * @return List of registry hives 
      */
-    private List<AbstractFile> findRegistryFiles(Content dataSource) {
+    private List<AbstractFile> findRegistryFiles() {
         List<AbstractFile> allRegistryFiles = new ArrayList<>();
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         
@@ -138,12 +138,9 @@ class ExtractRegistry extends Extract {
     
     /**
      * Identifies registry files in the database by mtimeItem, runs regripper on them, and parses the output.
-     * 
-     * @param dataSource
-     * @param controller 
      */
-    private void analyzeRegistryFiles(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        List<AbstractFile> allRegistryFiles = findRegistryFiles(dataSource);
+    private void analyzeRegistryFiles() {        
+        List<AbstractFile> allRegistryFiles = findRegistryFiles();
         
         // open the log file
         FileWriter logFile = null;
@@ -153,7 +150,7 @@ class ExtractRegistry extends Extract {
             java.util.logging.Logger.getLogger(ExtractRegistry.class.getName()).log(Level.SEVERE, null, ex);
         }
         
-        ExtractUSB extrctr = new ExtractUSB();
+        UsbDeviceIdMapper usbMapper = new UsbDeviceIdMapper();
         
         int j = 0;
         for (AbstractFile regFile : allRegistryFiles) {
@@ -171,7 +168,7 @@ class ExtractRegistry extends Extract {
                 continue;
             }
             
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
            
@@ -187,13 +184,13 @@ class ExtractRegistry extends Extract {
             logger.log(Level.INFO, moduleName + "- Now getting registry information from " + regFileNameLocal);
             RegOutputFiles regOutputFiles = executeRegRip(regFileNameLocal, outputPathBase);
             
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
             
             // parse the autopsy-specific output
             if (regOutputFiles.autopsyPlugins.isEmpty() == false) {
-                if (parseAutopsyPluginOutput(regOutputFiles.autopsyPlugins, regFile.getId(), extrctr) == false) {
+                if (parseAutopsyPluginOutput(regOutputFiles.autopsyPlugins, regFile.getId(), usbMapper) == false) {
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.failedParsingResults",
                                                 this.getName(), regFileName));
@@ -365,7 +362,7 @@ class ExtractRegistry extends Extract {
     }
     
     // @@@ VERIFY that we are doing the right thing when we parse multiple NTUSER.DAT
-    private boolean parseAutopsyPluginOutput(String regRecord, long orgId, ExtractUSB extrctr) {
+    private boolean parseAutopsyPluginOutput(String regRecord, long orgId, UsbDeviceIdMapper extrctr) {
         FileInputStream fstream = null;
         try {
             SleuthkitCase tempDb = currentCase.getSleuthkitCase();
@@ -448,7 +445,7 @@ class ExtractRegistry extends Extract {
                                 String dev = artnode.getAttribute("dev");       
                                 String model = dev; 
                                 if (dev.toLowerCase().contains("vid")) {
-                                    USBInfo info = extrctr.get(dev);
+                                    USBInfo info = extrctr.parseAndLookup(dev);
                                     if(info.getVendor()!=null)
                                         bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MAKE.getTypeID(),
                                                                                  NbBundle.getMessage(this.getClass(),
@@ -572,8 +569,10 @@ class ExtractRegistry extends Extract {
     }
 
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        analyzeRegistryFiles(dataSource, controller);
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
+        analyzeRegistryFiles();
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
index 9cfd1f30ef..1208d96080 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
@@ -36,7 +36,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -52,6 +52,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 class Firefox extends Extract {
 
+    private static final Logger logger = Logger.getLogger(Firefox.class.getName());
     private static final String historyQuery = "SELECT moz_historyvisits.id,url,title,visit_count,(visit_date/1000000) as visit_date,from_visit,(SELECT url FROM moz_places WHERE id=moz_historyvisits.from_visit) as ref FROM moz_places, moz_historyvisits WHERE moz_places.id = moz_historyvisits.place_id AND hidden = 0";
     private static final String cookieQuery = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed,(creationTime/1000000) as creationTime FROM moz_cookies";
     private static final String cookieQueryV3 = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed FROM moz_cookies";
@@ -59,21 +60,25 @@ class Firefox extends Extract {
     private static final String downloadQuery = "SELECT target, source,(startTime/1000000) as startTime, maxBytes  FROM moz_downloads";
     private static final String downloadQueryVersion24 = "SELECT url, content as target, (lastModified/1000000) as lastModified FROM moz_places, moz_annos WHERE moz_places.id = moz_annos.place_id AND moz_annos.anno_attribute_id = 3";
     private final IngestServices services = IngestServices.getInstance();
+    private Content dataSource;
+    private IngestJobContext context;
     
     Firefox() {
         moduleName = NbBundle.getMessage(Firefox.class, "Firefox.moduleName");
     }
 
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
         dataFound = false;
-        this.getHistory(dataSource, controller);
-        this.getBookmark(dataSource, controller);
-        this.getDownload(dataSource, controller);
-        this.getCookie(dataSource, controller);
+        this.getHistory();
+        this.getBookmark();
+        this.getDownload();
+        this.getCookie();
     }
 
-    private void getHistory(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getHistory() {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> historyFiles;
         try {
@@ -111,14 +116,14 @@ class Firefox extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, historyQuery);
-            logger.log(Level.INFO, "{0}- Now getting history from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0} - Now getting history from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
             for (HashMap<String, Object> result : tempList) {
-                Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
+                Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
@@ -155,14 +160,11 @@ class Firefox extends Extract {
 
     /**
      * Queries for bookmark files and adds artifacts
-     *
-     * @param dataSource
-     * @param controller
      */
-    private void getBookmark(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getBookmark() {
 
         FileManager fileManager = currentCase.getServices().getFileManager();
-        List<AbstractFile> bookmarkFiles = null;
+        List<AbstractFile> bookmarkFiles;
         try {
             bookmarkFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
         } catch (TskCoreException ex) {
@@ -195,15 +197,15 @@ class Firefox extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, bookmarkQuery);
-            logger.log(Level.INFO, moduleName + "- Now getting bookmarks from " + temps + " with " + tempList.size() + "artifacts identified.");
+            logger.log(Level.INFO, "{0} - Now getting bookmarks from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
             for (HashMap<String, Object> result : tempList) {
 
-                Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
+                Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
@@ -239,13 +241,10 @@ class Firefox extends Extract {
 
     /**
      * Queries for cookies file and adds artifacts
-     *
-     * @param dataSource
-     * @param controller
      */
-    private void getCookie(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getCookie() {
         FileManager fileManager = currentCase.getServices().getFileManager();
-        List<AbstractFile> cookiesFiles = null;
+        List<AbstractFile> cookiesFiles;
         try {
             cookiesFiles = fileManager.findFiles(dataSource, "cookies.sqlite", "Firefox");
         } catch (TskCoreException ex) {
@@ -278,12 +277,12 @@ class Firefox extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
             boolean checkColumn = Util.checkColumn("creationTime", "moz_cookies", temps);
-            String query = null;
+            String query;
             if (checkColumn) {
                 query = cookieQuery;
             } else {
@@ -291,10 +290,10 @@ class Firefox extends Extract {
             }
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, query);
-            logger.log(Level.INFO, moduleName + "- Now getting cookies from " + temps + " with " + tempList.size() + "artifacts identified.");
+            logger.log(Level.INFO, "{0} - Now getting cookies from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
             for (HashMap<String, Object> result : tempList) {
 
-                Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
+                Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
@@ -339,27 +338,21 @@ class Firefox extends Extract {
 
     /**
      * Queries for downloads files and adds artifacts
-     *
-     * @param dataSource
-     * @param controller
      */
-    private void getDownload(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        getDownloadPreVersion24(dataSource, controller);
-        getDownloadVersion24(dataSource, controller);
+    private void getDownload() {
+        getDownloadPreVersion24();
+        getDownloadVersion24();
     }
 
     /**
      * Finds downloads artifacts from Firefox data from versions before 24.0.
      *
      * Downloads were stored in a separate downloads database.
-     *
-     * @param dataSource
-     * @param controller
      */
-    private void getDownloadPreVersion24(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getDownloadPreVersion24() {
 
         FileManager fileManager = currentCase.getServices().getFileManager();
-        List<AbstractFile> downloadsFiles = null;
+        List<AbstractFile> downloadsFiles;
         try {
             downloadsFiles = fileManager.findFiles(dataSource, "downloads.sqlite", "Firefox");
         } catch (TskCoreException ex) {
@@ -392,7 +385,7 @@ class Firefox extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
@@ -464,13 +457,10 @@ class Firefox extends Extract {
      * Gets download artifacts from Firefox data from version 24.
      *
      * Downloads are stored in the places database.
-     *
-     * @param dataSource
-     * @param controller
      */
-    private void getDownloadVersion24(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getDownloadVersion24() {
         FileManager fileManager = currentCase.getServices().getFileManager();
-        List<AbstractFile> downloadsFiles = null;
+        List<AbstractFile> downloadsFiles;
         try {
             downloadsFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
         } catch (TskCoreException ex) {
@@ -504,17 +494,17 @@ class Firefox extends Extract {
                 continue;
             }
             File dbFile = new File(temps);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 dbFile.delete();
                 break;
             }
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, downloadQueryVersion24);
 
-            logger.log(Level.INFO, moduleName + "- Now getting downloads from " + temps + " with " + tempList.size() + "artifacts identified.");
+            logger.log(Level.INFO, "{0} - Now getting downloads from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
             for (HashMap<String, Object> result : tempList) {
 
-                Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
+                Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
 
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index 3275252ae9..5c9ea7271b 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -30,7 +30,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModule;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
@@ -45,21 +45,19 @@ import org.sleuthkit.autopsy.ingest.IngestJobContext;
 public final class RAImageIngestModule extends IngestModuleAdapter implements DataSourceIngestModule {
 
     private static final Logger logger = Logger.getLogger(RAImageIngestModule.class.getName());
-    private static int messageId = 0;
     private final List<Extract> extracters = new ArrayList<>();
     private final List<Extract> browserExtracters = new ArrayList<>();
     private IngestServices services = IngestServices.getInstance();
+    private IngestJobContext context;
     private StringBuilder subCompleted = new StringBuilder();
 
     RAImageIngestModule() {
     }
 
-    synchronized int getNextMessageId() {
-        return ++messageId;
-    }
-
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
+        this.context = context;
+        
         Extract registry = new ExtractRegistry();
         Extract iexplore = new ExtractIE();
         Extract recentDocuments = new RecentDocumentsByLnk();
@@ -84,22 +82,22 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
     }
     
     @Override
-    public ProcessResult process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        services.postMessage(IngestMessage.createMessage(getNextMessageId(), MessageType.INFO, RecentActivityExtracterModuleFactory.getModuleName(), "Started " + dataSource.getName()));
+    public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress progressBar) {
+        services.postMessage(IngestMessage.createMessage(MessageType.INFO, RecentActivityExtracterModuleFactory.getModuleName(), "Started " + dataSource.getName()));
 
-        controller.switchToDeterminate(extracters.size());
-        controller.progress(0);
+        progressBar.switchToDeterminate(extracters.size());
+        progressBar.progress(0);
         ArrayList<String> errors = new ArrayList<>();
 
         for (int i = 0; i < extracters.size(); i++) {
             Extract extracter = extracters.get(i);
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 logger.log(Level.INFO, "Recent Activity has been canceled, quitting before {0}", extracter.getName());
                 break;
             }
 
             try {
-                extracter.process(dataSource, controller);
+                extracter.process(dataSource, context);
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, "Exception occurred in " + extracter.getName(), ex);
                 subCompleted.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errModFailed",
@@ -107,7 +105,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
                 errors.add(
                         NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errModErrs", RecentActivityExtracterModuleFactory.getModuleName()));
             }
-            controller.progress(i + 1);
+            progressBar.progress(i + 1);
             errors.addAll(extracter.getErrorMessages());
         }
 
@@ -134,7 +132,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
             errorMessage.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsg.noErrs"));
             errorMsgSubject = NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsgSub.noErrs");
         }
-        final IngestMessage msg = IngestMessage.createMessage(getNextMessageId(), msgLevel, RecentActivityExtracterModuleFactory.getModuleName(),
+        final IngestMessage msg = IngestMessage.createMessage(msgLevel, RecentActivityExtracterModuleFactory.getModuleName(),
                                                               NbBundle.getMessage(this.getClass(),
                                                                                   "RAImageIngestModule.process.ingestMsg.finished",
                                                                                   dataSource.getName(), errorMsgSubject),
@@ -152,7 +150,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
             historyMsg.append("</li>");
         }
         historyMsg.append("</ul>");
-        final IngestMessage inboxMsg = IngestMessage.createMessage(getNextMessageId(), MessageType.INFO, RecentActivityExtracterModuleFactory.getModuleName(),
+        final IngestMessage inboxMsg = IngestMessage.createMessage(MessageType.INFO, RecentActivityExtracterModuleFactory.getModuleName(),
                                                                    NbBundle.getMessage(this.getClass(),
                                                                                        "RAImageIngestModule.process.ingestMsg.results",
                                                                                        dataSource.getName()),
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
index 47827a7ce0..bfa52c250a 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
@@ -32,7 +32,8 @@ import java.util.Collection;
 import org.sleuthkit.autopsy.coreutils.JLNK;
 import org.sleuthkit.autopsy.coreutils.JLnkParser;
 import org.sleuthkit.autopsy.coreutils.JLnkParserException;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -48,14 +49,16 @@ import org.sleuthkit.datamodel.*;
  */
 class RecentDocumentsByLnk extends Extract  {
     private static final Logger logger = Logger.getLogger(RecentDocumentsByLnk.class.getName());
-    private IngestServices services = IngestServices.getInstance();    
+    private IngestServices services = IngestServices.getInstance(); 
+    private Content dataSource;
+    private IngestJobContext context;
 
     /**
      * Find the documents that Windows stores about recent documents and make artifacts.
      * @param dataSource
      * @param controller 
      */
-    private void getRecentDocuments(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getRecentDocuments() {
         
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> recentFiles;
@@ -76,14 +79,14 @@ class RecentDocumentsByLnk extends Extract  {
         
         dataFound = true;
         for (AbstractFile recentFile : recentFiles) {
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 break;
             }
             
             if (recentFile.getSize() == 0) {
                 continue;
             }
-            JLNK lnk = null;
+            JLNK lnk;
             JLnkParser lnkParser = new JLnkParser(new ReadContentInputStream(recentFile), (int) recentFile.getSize());
             try {
                 lnk = lnkParser.parse();
@@ -100,7 +103,7 @@ class RecentDocumentsByLnk extends Extract  {
                 continue;
             }
            
-            Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
+            Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
             String path = lnk.getBestPath();
             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
                                                      NbBundle.getMessage(this.getClass(),
@@ -122,8 +125,10 @@ class RecentDocumentsByLnk extends Extract  {
     }
     
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
         dataFound = false;
-        this.getRecentDocuments(dataSource, controller);
+        this.getRecentDocuments();
     }
 }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index b57eb19a66..6bdd730345 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -31,11 +31,11 @@ import java.util.logging.Level;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
@@ -62,6 +62,7 @@ import org.xml.sax.SAXException;
  */
 class SearchEngineURLQueryAnalyzer extends Extract {
 
+    private static final Logger logger = Logger.getLogger(SearchEngineURLQueryAnalyzer.class.getName());
     private static final String XMLFILE = "SEUQAMappings.xml";
     private static final String XSDFILE = "SearchEngineSchema.xsd";
     private static String[] searchEngineNames;
@@ -71,6 +72,8 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             NbBundle.getMessage(SearchEngineURLQueryAnalyzer.class, "SearchEngineURLQueryAnalyzer.engineName.none"),
             NbBundle.getMessage(SearchEngineURLQueryAnalyzer.class, "SearchEngineURLQueryAnalyzer.domainSubStr.none"),
             new HashMap<String,String>());
+    private Content dataSource;
+    private IngestJobContext context;
 
     SearchEngineURLQueryAnalyzer() {
     }
@@ -223,7 +226,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         return basereturn;
     }
 
-    private void getURLs(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
+    private void getURLs() {
         int totalQueries = 0;
         try {
             //from blackboard_artifacts
@@ -255,7 +258,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
                 Collection<BlackboardAttribute> listAttributes = currentCase.getSleuthkitCase().getMatchingAttributes("Where `artifact_id` = " + artifact.getArtifactID());
                 getAttributes:
                 for (BlackboardAttribute attribute : listAttributes) {
-                    if (controller.isIngestJobCancelled()) {
+                    if (context.isJobCancelled()) {
                         break getAll;       //User cancled the process.
                     }
                     if (attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL.getTypeID()) {
@@ -292,13 +295,13 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         } catch (TskException e) {
             logger.log(Level.SEVERE, "Encountered error retrieving artifacts for search engine queries", e);
         } finally {
-            if (controller.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 logger.info("Operation terminated by user.");
             }
             IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent(
                     NbBundle.getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.parentModuleName.noSpace"),
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY));
-            logger.info("Extracted " + totalQueries + " queries from the blackboard");
+            logger.log(Level.INFO, "Extracted {0} queries from the blackboard", totalQueries);
         }
     }
 
@@ -314,15 +317,17 @@ class SearchEngineURLQueryAnalyzer extends Extract {
     }
 
     @Override
-    public void process(Content dataSource, DataSourceIngestModuleStatusHelper controller) {
-        this.getURLs(dataSource, controller);
+    public void process(Content dataSource, IngestJobContext context) {
+        this.dataSource = dataSource;
+        this.context = context;
+        this.getURLs();
         logger.log(Level.INFO, "Search Engine stats: \n{0}", getTotals());
     }
 
     @Override
     void init() throws IngestModuleException {
         try {
-            PlatformUtil.extractResourceToUserConfigDir(SearchEngineURLQueryAnalyzer.class, XMLFILE);
+            PlatformUtil.extractResourceToUserConfigDir(SearchEngineURLQueryAnalyzer.class, XMLFILE, false);
             init2();
         } catch (IOException e) {
             String message = "Unable to find " + XMLFILE;
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt
index 2ffa37f7b9..c8a83c862b 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2013.05.24
-# Date:    2013-05-24 20:34:03
+# Version: 2014.02.03
+# Date:    2014-02-03 20:34:03
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -26,10 +26,12 @@
 0002  Ingram
 0003  Club Mac
 0004  Nebraska Furniture Mart
+0011  Unknown manufacturer
+	7788  Flash mass storage drive
 0053  Planex
 	5301  GW-US54ZGL 802.11bg
 0079  DragonRise Inc.
-	0006  Generic USB Joystick
+	0006  PC TWIN SHOCK Gamepad
 	0011  Gamepad
 0105  Trust International B.V.
 	145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
@@ -37,8 +39,10 @@
 	0112  Card Reader
 017c  MLK
 	145f  Trust Deskset
+0200  TP-Link
+	0201  MA180 UMTS Modem
 0204  Chipsbank Microelectronics Co., Ltd
-	6025  CBM2080 Flash drive controller
+	6025  CBM2080 / CBM2090 Flash drive controller
 	6026  CBM1180 Flash drive controller
 0218  Hangzhou Worlde
 	0301  MIDI Port
@@ -105,9 +109,12 @@
 	2107  AVR Dragon
 	2109  STK541 ZigBee Development Board
 	210d  XPLAIN evaluation kit (CDC ACM)
+	2110  AVR JTAGICE3 Debugger and Programmer
 	2122  XMEGA-A1 Explained evaluation kit
 	2310  EVK11xx evaluation board
 	2fe4  ATxmega32A4U DFU bootloader
+	2ff0  atmega32u2 DFU bootloader
+	2ffa  at90usb162 DFU bootloader
 	2ffb  at90usb AVR DFU bootloader
 	2ffd  at89c5130/c5131 DFU bootloader
 	2fff  at89c5132/c51snd1c DFU bootloader
@@ -189,6 +196,8 @@
 	0412  Printing Support
 	0417  LaserJet 1200 series
 	0423  HS-COMBO Cardreader
+	042a  LaserJet M1132 MFP
+	0441  HP Prime Calculator
 	0504  DeskJet 885c
 	0505  ScanJet 2100c
 	0507  DVD+RW
@@ -219,6 +228,7 @@
 	0912  Printing Support
 	0917  LaserJet 3330
 	0924  Modular Smartcard Keyboard
+	094a  Optical Mouse [672662-001]
 	0a01  ScanJet 2400c
 	0a17  color LaserJet 3700
 	0b01  ScanJet 82x0C
@@ -335,7 +345,7 @@
 	2311  OfficeJet d series
 	2312  OfficeJet Pro L7700
 	2317  LaserJet 4350
-	231d  4 GB Flash Drive
+	231d  Broadcom 2070 Bluetooth Combo
 	2402  PhotoSmart 7700 series
 	2404  Deskjet F2280 series
 	2405  ScanJet 4070 PhotoSmart
@@ -346,6 +356,7 @@
 	2504  DeskJet F4200 series
 	2505  ScanJet 3770
 	2512  OfficeJet Pro L7300
+	2514  4-port hub
 	2517  LaserJet 2410
 	251d  Gobi 2000 Wireless Modem
 	2524  LP3065 30" Monitor Hub
@@ -421,6 +432,7 @@
 	3b11  PSC 1300 series
 	3b17  LaserJet M1005 MFP
 	3c02  PhotoSmart 7350
+	3c05  Scanjet Professional 1000 Mobile Scanner
 	3c11  PSC 1358
 	3c17  EWS UPD
 	3d02  PhotoSmart 7350~
@@ -470,6 +482,7 @@
 	5017  EWS UPD
 	5111  PhotoSmart 3200 series
 	5211  PhotoSmart 3300 series
+	5307  v165w Stick
 	5311  OfficeJet 6300
 	5312  Officejet Pro 8500A
 	5411  OfficeJet 4300
@@ -689,11 +702,20 @@
 	8028  Dev board JTAG (FT232H based)
 	8040  4 Port Hub
 	8070  7 Port Hub
+	8140  Vehicle Explorer Interface
+	8210  MGTimer - MGCC (Vic) Timing System
 	8370  7 Port Hub
 	8371  PS/2 Keyboard And Mouse
 	8372  FT8U100AX Serial Port
 	8a28  Rainforest Automation ZigBee Controller
 	8a98  TIAO Multi-Protocol Adapter
+	8b28  Alpermann+Velte TCI70
+	8b29  Alpermann+Velte TC60 CLS
+	8b2a  Alpermann+Velte Rubidium Q1
+	8b2b  Alpermann+Velte TCD
+	8b2c  Alpermann+Velte TCC70
+	9133  CallerID
+	9135  Rotary Pub alarm
 	9e90  Marvell OpenRD Base/Client
 	9f80  Ewert Energy Systems CANdapter
 	a6d0  Texas Instruments XDS100v2 JTAG / BeagleBone A3
@@ -726,6 +748,7 @@
 	c8bc  Alpermann+Velte Rubidium S1
 	c8bd  Alpermann+Velte Rubidium T1
 	c8be  Alpermann+Velte Rubidium D1
+	c8bf  Alpermann+Velte TC60 RLV
 	cc48  Tactrix OpenPort 1.3 Mitsubishi
 	cc49  Tactrix OpenPort 1.3 Subaru
 	cc4a  Tactrix OpenPort 1.3 Universal
@@ -994,7 +1017,10 @@
 	05d4  EasyShare C180 Digital Camera
 	1001  EasyShare SV811 Digital Picture Frame
 	4000  InkJet Color Printer
+	4021  Photo Printer 6800
 	4022  1400 Digital Photo Printer
+	402e  605 Photo Printer
+	4034  805 Photo Printer
 	4056  ESP 7200 Series AiO
 	4109  EasyShare Printer Dock Series 3
 	410d  EasyShare G600 Printer Dock
@@ -1006,6 +1032,7 @@
 	6004  i60
 	6005  i80
 040b  Weltrend Semiconductor
+	0a68  Func MS-3 gaming mouse [WT6573F MCU]
 	6510  Weltrend Bar Code Reader
 	6520  XBOX Xploder
 	6533  Speed-Link Competition Pro
@@ -1234,6 +1261,7 @@
 	4056  Live! Cam Video IM Pro
 	4057  Live! Cam Optia
 	4058  Live! Cam Optia AF
+	405f  WebCam Vista (VF0330)
 	4061  Live! Cam Notebook Pro [VF0400]
 	4063  Live! Cam Video IM Pro
 	4068  Live! Cam Notebook [VF0470]
@@ -1450,7 +1478,7 @@
 	4060  Ultra Fast Media Reader
 	4064  Ultra Fast Media Reader
 	7500  LAN7500 Ethernet 10/100/1000 Adapter
-	9512  LAN9500 Ethernet 10/100 Adapter / SMSC9512/9514 Hub
+	9512  SMC9512/9514 USB Hub
 	a700  2 Port Hub
 	ec00  SMSC9512/9514 Fast Ethernet Adapter
 0425  Motorola Semiconductors HK, Ltd
@@ -1645,6 +1673,7 @@
 	010d  3500-4500 series
 	010f  6500 series
 	0142  X3650 (Printer, Scanner, Copier)
+	01fa  S310 series
 	4303  Xerox WorkCentre Pro 412
 043e  LG Electronics USA, Inc.
 	3001  AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
@@ -1652,6 +1681,8 @@
 	4a4d  Flatron 915FT Plus Monitor
 	7001  MF-PD100 Soul Digital MP3 Player
 	7013  MP3 Player
+	70d7  Mouse Scanner LSM-150 [LG Smart Scan Mouse]
+	70f5  External HDD
 	8484  LPC-U30 Webcam II
 	8585  LPC-UC35 Webcam
 	8888  Electronics VCS Camera II(LPC-U20)
@@ -1706,6 +1737,7 @@
 	b10a  T.16000M Joystick
 	b203  360 Modena Pro Wheel
 	b300  Firestorm Dual Power
+	b303  FireStorm Dual Analog 2
 	b304  Firestorm Dual Power
 	b307  vibrating Upad
 	b30b  Wireless VibrationPad
@@ -1738,10 +1770,11 @@
 	625f  TUSB6250 ATA Bridge
 	8042  Hub
 	dbc0  Device Bay Controller
-	e001  GraphLink
+	e001  GraphLink [SilverLink]
 	e003  TI-84 Plus Calculator
 	e004  TI-89 Titanium Calculator
 	e008  TI-84 Plus Silver Calculator
+	e012  TI-Nspire Calculator
 	f430  MSP-FET430UIF JTAG Tool
 	f432  eZ430 Development Tool
 	ffff  Bluetooth Device
@@ -1762,6 +1795,7 @@
 	0151  Super Flash 1GB / GXT  64MB Flash Drive
 	0162  SiS162 usb Wireless LAN Adapter
 	0163  802.11 Wireless LAN Adapter
+	0817  SiS-184-ASUS-4352.17 touch panel
 	5401  Wireless Adapter RO80211GS-USB
 0458  KYE Systems Corp. (Mouse Systems)
 	0001  Mouse
@@ -1854,6 +1888,7 @@
 	705c  Genius iSlim 1300AF
 	7079  FaceCam 2025R
 	707f  TVGo DVB-T03 [RTL2832]
+	7088  WideCam 1050
 0459  Adobe Systems, Inc.
 045a  SONICblue, Inc.
 	07da  Supra Express 56K modem
@@ -1888,7 +1923,7 @@
 	0008  SideWinder Precision Pro
 	0009  IntelliMouse
 	000b  Natural Keyboard Elite
-	000e  SideWinder® Freestyle Pro
+	000e  SideWinder® Freestyle Pro
 	0014  Digital Sound System 80
 	001a  SideWinder Precision Racing Wheel
 	001b  SideWinder Force Feedback 2 Joystick
@@ -1984,10 +2019,12 @@
 	029d  Xbox360 HD-DVD Drive
 	029e  Xbox360 HD-DVD Memory Unit
 	02a0  Xbox360 Big Button IR
+	02a1  Xbox 360 Wireless Receiver for Windows
 	02a8  Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280]
 	02ad  Xbox NUI Audio
 	02ae  Xbox NUI Camera
 	02b0  Xbox NUI Motor
+	02b6  Xbox 360 / Bluetooth Wireless Headset
 	0400  Windows Powered Pocket PC 2002
 	0401  Windows Powered Pocket PC 2002
 	0402  Windows Powered Pocket PC 2002
@@ -2142,7 +2179,10 @@
 	076d  LifeCam HD-5000
 	0772  LifeCam Studio
 	0779  LifeCam HD-3000
+	0780  Comfort Curve Keyboard 3000
+	0797  Optical Mouse 200
 	930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
+	ffca  Catalina
 	fff8  Keyboard
 	ffff  Windows CE Mass Storage
 0460  Ace Cad Enterprise Co., Ltd
@@ -2215,7 +2255,7 @@
 0467  AT&T Paradyne
 0468  Wieson Technologies Co., Ltd
 046a  Cherry GmbH
-	0001  My3000 Keyboard
+	0001  Keyboard
 	0003  My3000 Hub
 	0004  CyBoard Keyboard
 	0005  XX33 SmartCard Reader Keyboard
@@ -2228,6 +2268,7 @@
 	002a  Wireless Mouse & Keyboard
 	002d  SmartTerminal XX44
 	003e  SmartTerminal ST-2xxx
+	0041  G86 6240 Keyboard
 	0080  eHealth Terminal ST 1503
 	0081  eHealth Keyboard G87 1504
 	0106  R-300 Wireless Mouse Receiver
@@ -2367,6 +2408,7 @@
 	0a13  Z-5 Speakers
 	0a17  G330 Headset
 	0a1f  G930
+	0a29  H600 [Wireless Headset]
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b305  BT Mini-Receiver
@@ -2430,20 +2472,25 @@
 	c061  RX1500 Laser Mouse
 	c062  M-UAS144 [LS1 Laser Mouse]
 	c063  DELL Laser Mouse
+	c064  M110 corded optical mouse (M-B0001)
+	c066  G9x Laser Mouse
 	c068  G500 Laser Mouse
 	c069  M500 Laser Mouse
 	c06a  USB Optical Mouse
 	c06b  G700 Wireless Gaming Mouse
 	c06c  Optical Mouse
+	c077  M105 Optical Mouse
 	c101  UltraX Media Remote
 	c110  Harmony 785/885 Remote
 	c111  Harmony 525 Remote
 	c112  Harmony 890 Remote
 	c11f  Harmony 900/1100 Remote
 	c121  Harmony One Remote
-	c122  Harmony 700 Remote
+	c122  Harmony 650/700 Remote
 	c124  Harmony 300 Remote
 	c125  Harmony 200 Remote
+	c126  Harmony Link
+	c12b  Harmony Touch Remote
 	c201  WingMan Extreme Joystick with Throttle
 	c202  WingMan Formula
 	c207  WingMan Extreme Digital 3D
@@ -2473,12 +2520,18 @@
 	c225  G11/G15 Keyboard / G keys
 	c226  G15 Refresh Keyboard
 	c227  G15 Refresh Keyboard
+	c228  G19 Gaming Keyboard
+	c229  G19 Gaming Keyboard Macro Interface
 	c22a  Gaming Keyboard G110
 	c22b  Gaming Keyboard G110 G-keys
 	c22d  G510 Gaming Keyboard
 	c22e  G510 Gaming Keyboard onboard audio
 	c245  G400 Optical Mouse
 	c246  Gaming Mouse G300
+	c248  G105 Gaming Keyboard
+	c24a  G600 Gaming Mouse
+	c24d  G710 Gaming Keyboard
+	c24e  G500s Laser Gaming Mouse
 	c281  WingMan Force
 	c283  WingMan Force 3D
 	c285  WingMan Strike Force 3D
@@ -2550,12 +2603,14 @@
 	c526  Nano Receiver
 	c529  Logitech Keyboard + Mice
 	c52b  Unifying Receiver
+	c52e  MK260 Wireless Combo Receiver
 	c52f  Unifying Receiver
 	c532  Unifying Receiver
 	c623  3Dconnexion Space Traveller 3D Mouse
 	c625  3Dconnexion Space Pilot 3D Mouse
 	c626  3Dconnexion Space Navigator 3D Mouse
 	c627  3Dconnexion Space Explorer 3D Mouse
+	c629  3Dconnexion SpacePilot Pro 3D Mouse
 	c702  Cordless Presenter
 	c703  Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)
 	c704  diNovo Wireless Desktop
@@ -2694,6 +2749,7 @@
 	20b6  GoGear Vibe
 	20d0  SPZ2000 Webcam [PixArt PAC7332]
 	20e3  GoGear Raga
+	20e4  GoGear ViBE 8GB
 	262c  SPC230NC Webcam
 	485d  Senselock SenseIV v2.x
 	df55  LPCXpresso LPC-Link
@@ -2827,15 +2883,20 @@
 	4254  BUA-100 Bluetooth Adapter
 	ac01  Savi 7xx
 	ad01  GameCom 777 5.1 Headset
+	c00e  Blackwire C310 headset
 0480  Toshiba America Info. Systems, Inc.
 	0001  InTouch Module
 	0004  InTouch Module
 	0011  InTouch Module
 	0014  InTouch Module
+	a006  External Disk 1.5TB
 	a007  External Disk USB 3.0
+	a009  Stor.E Basics
+	d010  External Disk 3TB
 0481  Zenith Data Systems
 0482  Kyocera Corp.
 	000e  FS-1020D Printer
+	000f  FS-1920 Mono Printer
 	0100  Finecam S3x
 	0101  Finecam S4
 	0103  Finecam S5
@@ -2850,7 +2911,7 @@
 	0138  Unicorn II (ST70138B + MTC-20174TQ chipset)
 	1307  Cytronix 6in1 Card Reader
 	163d  Cool Icam Digi-MP3
-	2015  TouchChip® Fingerprint Reader
+	2015  TouchChip® Fingerprint Reader
 	2016  Fingerprint Reader
 	2017  Biometric Smart Card Reader
 	2018  BioSimKey
@@ -2863,6 +2924,7 @@
 	5000  ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
 	5001  ST Micro Bluetooth Device
 	5710  Joystick in FS Mode
+	5720  STM microSD Flash Device
 	5721  Hantek DDS-3X25 Arbitrary Waveform Generator
 	5740  STM32F407
 	7270  ST Micro Serial Bridge
@@ -2895,6 +2957,8 @@
 	9006  IT9135 BDA Afatech DVB-T HDTV Dongle
 	9009  Zolid HD DVD Maker
 	9135  Zolid Mini DVB-T Stick
+	9503  ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]
+	9507  ITE it9507 full featured DVB-T transmission chip [ccHDtv]
 048f  Eicon Tech.
 0490  United Microelectronics Corp.
 0491  Capetronic
@@ -3253,12 +3317,14 @@
 	171b  MP960
 	1721  MP210 ser
 	1723  MP470 ser
+	1724  PIXMA MP520 series
 	1725  MP610 ser
 	1726  MP970 ser
 	1727  MX300 ser
 	1728  MX310 ser
 	1729  MX700 ser
 	172b  MP140 ser
+	173b  PIXMA MP270 All-In-One Printer
 	173e  MP560
 	173f  Pixma MP640 Multifunction device
 	1748  Pixma MG5150
@@ -3500,34 +3566,65 @@
 	3100  PowerShot TX1
 	310b  SELPHY CP600
 	310e  Digital IXUS 50 (PTP mode)
+	310f  PowerShot A420
 	3110  EOS Digital Rebel XTi
+	3115  PowerShot SD900 / Digital IXUS 900 Ti / IXY DIGITAL 1000
 	3116  Digital IXUS 750 / PowerShot SD550 (PTP mode)
 	3117  PowerShot A700
 	3119  PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS
+	311a  PowerShot S3 IS
 	311b  PowerShot A540
+	311c  PowerShot SD600 DIGITAL ELPH / DIGITAL IXUS 60 / IXY DIGITAL 70
+	3125  PowerShot G7
+	3126  PowerShot A530
 	3127  SELPHY CP710
 	3128  SELPHY CP510
 	312d  Elura 100
+	3136  PowerShot SD800 IS / Digital IXUS 850 IS / IXY DIGITAL 900 IS
+	3137  PowerShot SD40 / Digital IXUS i7 IXY / DIGITAL L4
 	3138  PowerShot A710 IS
+	3139  PowerShot A640
+	313a  PowerShot A630
 	3141  SELPHY ES1
 	3142  SELPHY CP730
 	3143  SELPHY CP720
 	3145  EOS 450D
+	3146  EOS 40D
 	3147  EOS 1Ds Mark III
-	314f  Powershot SD1000
+	3148  PowerShot S5 IS
+	3149  PowerShot A460
+	314b  PowerShot SD850 IS DIGITAL ELPH / Digital IXUS 950 IS / IXY DIGITAL 810 IS
+	314c  PowerShot A570 IS
+	314d  PowerShot A560
+	314e  PowerShot SD750 DIGITAL ELPH / DIGITAL IXUS 75 / IXY DIGITAL 90
+	314f  PowerShot SD1000 DIGITAL ELPH / DIGITAL IXUS 70 / IXY DIGITAL 10
+	3150  PowerShot A550
 	3155  PowerShot A450
 	315a  PowerShot G9
+	315b  PowerShot A650 IS
 	315d  PowerShot A720
+	315e  PowerShot SX100 IS
+	315f  PowerShot SD950 IS DIGITAL ELPH / DIGITAL IXUS 960 IS / IXY DIGITAL 2000 IS
 	3160  Digital IXUS 860 IS
 	3170  SELPHY CP750
 	3171  SELPHY CP740
+	3173  PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS
+	3174  PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS
 	3175  IXY Digital 25 IS
 	3176  PowerShot A590
+	3177  PowerShot A580
 	317a  PC1267 [Powershot A470]
 	3184  Digital IXUS 80 IS (PTP mode)
 	3185  SELPHY ES2
 	3186  SELPHY ES20
+	318d  PowerShot SX100 IS
+	318e  PowerShot A1000 IS
+	318f  PowerShot G10
+	3191  PowerShot A2000 IS
 	3192  PowerShot SX110 IS
+	3193  PowerShot SD990 IS DIGITAL ELPH / Digital IXUS 980 IS / IXY DIGITAL 3000 IS
+	3195  PowerShot SX1 IS
+	3196  PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS
 	319a  EOS 7D
 	31aa  SELPHY CP770
 	31ab  SELPHY CP760
@@ -3536,12 +3633,27 @@
 	31b0  SELPHY ES30
 	31b1  SELPHY CP530
 	31bc  PowerShot D10
+	31bd  PowerShot SD960 IS DIGITAL ELPH / Digital IXUS 110 IS / IXY DIGITAL 510 IS
+	31be  PowerShot A2100 IS
 	31bf  PowerShot A480
 	31c0  PowerShot SX200 IS
+	31c1  PowerShot SD970 IS DIGITAL ELPH / Digital IXUS 990 IS / IXY DIGITAL 830 IS
+	31c2  PowerShot SD780 IS DIGITAL ELPH / Digital IXUS 100 IS / IXY DIGITAL 210 IS
+	31c3  PowerShot A1100 IS
+	31c4  PowerShot SD1200 IS DIGITAL ELPH / Digital IXUS 95 IS / IXY DIGITAL 110 IS
+	31cf  EOS Rebel T1i / EOS 500D / EOS Kiss X3
 	31dd  SELPHY CP780
+	31df  PowerShot G11
+	31e0  PowerShot SX120 IS
+	31e1  PowerShot S90
+	31e4  PowerShot SX20 IS
 	31e5  Digital IXUS 200 IS
+	31e6  PowerShot SD940 IS DIGITAL ELPH / Digital IXUS 120 IS / IXY DIGITAL 220 IS
+	31e7  SELPHY CP790
+	31ea  EOS Rebel T2i / EOS 550D / EOS Kiss X4
 	31ee  SELPHY ES40
 	31ef  PowerShot A495
+	31f0  PowerShot A490
 	31f1  PowerShot A3100 IS / PowerShot A3150 IS
 	31f2  PowerShot A3000 IS
 	31f3  PowerShot Digital ELPH SD1400 IS
@@ -3552,6 +3664,7 @@
 	31f8  Powershot SD4500 IS / IXUS 1000 HS / IXY 50S
 	31ff  Digital IXUS 55
 	3209  Vixia HF S21 A
+	320f  PowerShot G12
 	3210  Powershot SX30 IS
 	3211  PowerShot SX130 IS
 	3212  Powershot S95
@@ -3559,11 +3672,14 @@
 	3218  EOS 600D / Rebel T3i (ptp)
 	3223  PowerShot A3300 IS
 	3224  PowerShot A3200 IS
+	3225  PowerShot ELPH 500 HS / IXUS 310 HS
 	3226  PowerShow A800
+	3227  PowerShot ELPH 100 HS / IXUS 115 HS
 	3228  PowerShot SX230 HS
 	3229  PowerShot ELPH 300 HS / IXUS 220 HS
 	322a  PowerShot A2200
 	322b  Powershot A1200
+	322c  PowerShot SX220 HS
 	3233  PowerShot G1 X
 	3234  PowerShot SX150 IS
 	3236  PowerShot S100
@@ -3574,6 +3690,7 @@
 	323f  PowerShot A810
 	3240  PowerShot ELPH 320 HS / IXUS 240 HS
 	3241  PowerShot ELPH 110 HS / IXUS 125 HS
+	3242  PowerShot D20
 	3243  PowerShot A4000 IS
 	3244  PowerShot SX260 HS
 	3245  PowerShot SX240 HS
@@ -3588,6 +3705,16 @@
 	325a  PowerShot SX160 IS
 	325b  PowerShot S110
 	325c  PowerShot SX500 IS
+	325f  PowerShot SX280 HS
+	3260  PowerShot SX270 HS
+	3262  PowerShot A2600
+	3264  PowerShot A1400
+	3265  Powershot ELPH 130 IS / IXUS 140
+	3268  PowerShot ELPH 330 HS / IXUS 255 HS
+	3271  PowerShot A2500
+	3276  PowerShot SX170 IS
+	3277  PowerShot SX510 HS
+	327d  Powershot ELPH 115 IS / IXUS 132
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -3658,8 +3785,11 @@
 	0413  D40 (mass storage mode)
 	041e  D60 digital camera (mass storage mode)
 	0422  D700 (ptp)
+	0423  D5000
 	0424  D3000
 	0425  D300S
+	0428  D7000
+	0429  D5100
 	042a  D800 (ptp)
 	0f03  PD-10 Wireless Printer Adapter
 	4000  Coolscan LS 40 ED
@@ -3688,6 +3818,7 @@
 	4427  Portable CD ROM
 	4482  Serial Converter
 	4485  Serial Converter
+	4524  40 Character Vacuum Fluorescent Display
 	4525  Double sided CRT
 	4535  4610 Suremark Printer
 	4550  NVRAM (128 KB)
@@ -3700,6 +3831,7 @@
 	0001  Mouse
 	0002  CY7C63x0x Thermometer
 	0033  Mouse
+	0060  Wireless optical mouse
 	0100  Cino FuzzyScan F760-B
 	0101  Keyboard/Hub
 	0102  Keyboard with APM
@@ -4018,6 +4150,7 @@
 	1041  fi-4120c Scanner
 	1042  fi-4220c Scanner
 	105b  AH-F401U Air H device
+	1084  PalmSecure Sensor V2
 	1096  fi-5110EOX
 	1097  fi-5110C
 	10ae  fi-4120C2
@@ -4027,6 +4160,7 @@
 	10e7  fi-5900C
 	10fe  S500
 	1150  fi-6230
+	201d  SATA 3.0 6Gbit/s Adaptor [GROOVY]
 04c6  Toshiba America Electronic Components
 04c7  Micro Macro Technologies
 04c8  Konica Corp.
@@ -4040,7 +4174,9 @@
 	072c  Revio KD20M
 	072d  Revio KD410Z
 04ca  Lite-On Technology Corp.
+	004f  SK-9020 keyboard
 	1766  HID Monitor Controls
+	2004  Bluetooth 4.0 [Broadcom BCM20702A0]
 	9304  Hub
 	f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
@@ -4186,6 +4322,7 @@
 	8001  ICD2 in-circuit debugger
 	8101  PIC24F Starter Kit
 	8107  Microstick II
+	9004  Microchip REAL ICE
 	900a  PICkit3
 	c001  PicoLCD 20x4
 	f8da  Hughski Ltd. ColorHug
@@ -4204,10 +4341,13 @@
 	1400  PS/2 keyboard + mouse controller
 	1503  Shortboard Lefty
 	1603  Keyboard
+	1702  Keyboard LKS02
 	2013  Keyboard [Das Keyboard]
 	2221  Keyboard
 	2323  Keyboard
+	2519  Shenzhen LogoTech 2.4GHz receiver
 	2832  1channel Telephone line recorder
+	2834  HT82A834R Audio MCU
 	a055  Keyboard
 04da  Panasonic (Matsushita)
 	0901  LS-120 Camera
@@ -4300,6 +4440,7 @@
 04e1  Iiyama North America, Inc.
 	0201  Monitor Hub
 04e2  Exar Corp.
+	1410  XR21V1410 USB-UART IC
 04e3  Zilog, Inc.
 04e4  ACC Microelectronics
 04e5  Promise Technology
@@ -4358,24 +4499,25 @@
 	5151  SCR338 Keyboard Smart Card Reader
 	5292  SCL011 RFID reader
 	5410  SCR35xx Smart Card Reader
+	5591  SCL3711-NFC&RW
 	e000  SCRx31 Reader
 	e001  SCR331 SmartCard Reader
 	e003  SPR532 PinPad SmartCard Reader
 04e7  Elo TouchSystems
 	0001  TouchScreen
 	0002  Touchmonitor Interface 2600 Rev 2
-	0004  4000U CarrollTouch® Touchmonitor Interface
-	0007  2500U IntelliTouch® Touchmonitor Interface
-	0008  3000U AccuTouch® Touchmonitor Interface
-	0009  4000U CarrollTouch® Touchmonitor Interface
+	0004  4000U CarrollTouch® Touchmonitor Interface
+	0007  2500U IntelliTouch® Touchmonitor Interface
+	0008  3000U AccuTouch® Touchmonitor Interface
+	0009  4000U CarrollTouch® Touchmonitor Interface
 	0020  Touchscreen Interface (2700)
 	0021  Touchmonitor Interface
-	0030  4500U CarrollTouch® Touchmonitor Interface
+	0030  4500U CarrollTouch® Touchmonitor Interface
 	0032  Touchmonitor Interface
 	0033  Touchmonitor Interface
 	0041  5010 Surface Capacitive Touchmonitor Interface
 	0042  Touchmonitor Interface
-	0050  2216 AccuTouch® Touchmonitor Interface
+	0050  2216 AccuTouch® Touchmonitor Interface
 	0071  Touchmonitor Interface
 	0072  Touchmonitor Interface
 	0081  Touchmonitor Interface
@@ -4385,7 +4527,7 @@
 	0100  Kingston Flash Drive (128MB)
 	0110  Connect3D Flash Drive
 	0111  Connect3D Flash Drive
-	0300  E2530 Phone (Mass storage mode)
+	0300  E2530 / GT-C3350 Phones (Mass storage mode)
 	1003  MP3 Player and Recorder
 	1006  SDC-200Z
 	130c  NX100
@@ -4522,8 +4664,10 @@
 	5f04  NEXiO Sync
 	5f05  STORY Station 1TB
 	6032  G2 Portable hard drive
+	6034  G2 Portable hard drive
 	60b3  M2 Portable Hard Drive
 	60c4  M2 Portable Hard Drive USB 3.0
+	61b6  M3 Portable Hard Drive 1TB
 	6601  Mobile Phone
 	6602  Galaxy
 	6603  Galaxy
@@ -4563,7 +4707,7 @@
 	685b  GT-I9100 Phone [Galaxy S II] (mass storage mode)
 	685c  GT-I9250 Phone [Galaxy Nexus]
 	685d  GT-I9100 Phone [Galaxy S II] (Download mode)
-	685e  GT-I9100 Phone [Galaxy S II] (USB Debugging mode)
+	685e  GT-I9100 / GT-C3350 Phones (USB Debugging mode)
 	6860  GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1]
 	6865  GT-I9300 Phone [Galaxy S III] (PTP mode)
 	6866  GT-I9300 Phone [Galaxy S III] (debugging mode)
@@ -4620,6 +4764,7 @@
 	0760  Acer KU-0760 Keyboard
 	0841  HP Multimedia Keyboard
 	0860  2.4G Multimedia Wireless Kit
+	1121  Periboard 717 Mini Wireless Keyboard
 	a001  E-Video DC-100 Camera
 	a120  ORITE CCD Webcam(PC370R)
 	a121  ORITE CCD Webcam(PC370R)
@@ -4656,6 +4801,7 @@
 	b057  integrated USB webcam
 	b059  CKF7037 HP webcam
 	b071  2.0M UVC Webcam / CNF7129
+	b083  CKF7063 Webcam (HP)
 	b091  Webcam
 	b104  CNF7069 Webcam
 	b107  CNF7070 Webcam
@@ -4667,6 +4813,7 @@
 	b1b9  Asus Integrated Webcam
 	b1cf  Lenovo Integrated Camera
 	b1d6  CNF9055 Toshiba Webcam
+	b1e4  Toshiba Integrated Webcam
 	b213  Fujitsu Integrated Camera
 	b217  Lenovo Integrated Camera (0.3MP)
 	b221  integrated camera
@@ -4678,7 +4825,9 @@
 	b2b9  Lenovo Integrated Camera UVC
 	b2ea  Integrated Camera [ThinkPad]
 	b330  Asus 720p CMOS webcam
+	b354  UVC 1.00 device HD UVC WebCam
 04f3  Elan Microelectronics Corp.
+	000a  Touchscreen
 	0103  ActiveJet K-2024 Multimedia Keyboard
 	01a4  Wireless Keyboard
 	0210  Optical Mouse
@@ -4894,6 +5043,7 @@
 	201a  PT-18R P-touch label printer
 	201b  QL-650TD P-Touch Label Printer
 	2027  QL-560 P-Touch Label Printer
+	202b  PT-7600 P-Touch Label Printer
 	2100  Card Reader Writer
 04fa  Dallas Semiconductor
 	2490  DS1490F 2-in-1 Fob, 1-Wire adapter
@@ -4945,6 +5095,7 @@
 	16e3  n30 Handheld Sync
 	3202  Liquid
 	3203  Liquid (Debug mode)
+	3230  BeTouch E120
 	3317  Liquid
 	3325  Iconia tablet A500
 	3341  Iconia tablet A500
@@ -5015,6 +5166,7 @@
 	0304  FSU304 USB 2.0 - 4 Ports Hub
 	0307  USB 2.0 - 7 ports Hub [FSU307]
 	0409  F5U409 Serial
+	0416  Staples 12416 7 port desktop hub
 	0551  F6C550-AVR UPS
 	0706  2-N-1 7-Port Hub (Lower half)
 	0802  Nostromo n40 Gamepad
@@ -5026,6 +5178,8 @@
 	1004  F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU]
 	1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
 	1103  F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]
+	1106  F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	1109  F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
 	11f2  ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]
 	1202  F5U120-PC Parallel Printer Port
 	1203  F5U120-PC Serial Port
@@ -5117,7 +5271,7 @@
 	a4a2  Linux-USB Ethernet/RNDIS Gadget
 	a4a3  Linux-USB user-mode isochronous source/sink
 	a4a4  Linux-USB user-mode bulk source/sink
-	a4a5  Linux-USB File Storage Gadget
+	a4a5  Pocketbook Pro 903
 	a4a6  Linux-USB Serial Gadget
 	a4a7  Linux-USB Serial Gadget (CDC ACM mode)
 	a4a8  Linux-USB Printer Gadget
@@ -5180,6 +5334,7 @@
 0539  Shyh Shiun Terminals Co., Ltd
 053a  PrehKeyTec GmbH
 	0b00  Hub
+	0b01  Preh MCI 3100
 053b  Global Village Communication
 053c  Institut of Microelectronic & Mechatronic Systems
 053d  Silicon Architect
@@ -5247,6 +5402,7 @@
 	2727  Xircom PGUNET USB-USB Bridge
 	2750  EZ-Link (EZLNKUSB.SYS)
 	2810  Cypress ATAPI Bridge
+	4d90  AmScope MD1900 camera
 	7777  Bluetooth Device
 	9999  AN2131 uninitialized (?)
 0548  Tyan Computer Corp.
@@ -5360,6 +5516,7 @@
 	01d0  DVD+RW External Drive DRU-700A
 	01d5  IC RECORDER
 	01de  VRD-VC10 [Video Capture]
+	01e8  UP-DR150 Photo Printer
 	01e9  Net MD
 	01ea  Hi-MD WALKMAN
 	01ee  IC RECORDER
@@ -5427,6 +5584,7 @@
 	0440  DSC-H55
 	0485  MHS-PM5 HD camcorder
 	04cb  WALKMAN NWZ-E354
+	06bb  WALKMAN NWZ-F805
 	1000  Wireless Buzz! Receiver
 054d  Try Corp.
 054e  Proside Corp.
@@ -5472,6 +5630,7 @@
 	4000  DSB-650 10Mbps Ethernet [klsi]
 	7000  Hub
 	7820  UC-2322 2xSerial Ports [mos7820]
+	8021  CS1764A [CubiQ DVI KVMP Switch]
 0558  Truevision, Inc.
 	1009  GW Instek GDS-1000 Oscilloscope
 	100a  GW Instek GDS-1000A Oscilloscope
@@ -5654,6 +5813,7 @@
 	00d6  Bamboo Pen & Touch (CTH-460)
 	00db  Bamboo Fun (CTH-661SE-NL)
 	00dd  Bamboo Pen (CTL-470)
+	00de  CTH-470 [Bamboo Fun Pen & Touch]
 	00f6  Cintiq 24HD touch (DTH-2400) touchscreen
 	00f8  Cintiq 24HD touch (DTH-2400) tablet
 	0400  PenPartner 4x5
@@ -6248,6 +6408,7 @@
 	0323  LaCie d2 Drive USB2
 	0421  Big Disk G465
 	0641  Mobile Hard Drive
+	100c  Rugged Triple Interface Mobile Hard Drive
 	1010  Desktop Hard Drive
 	1019  Desktop Hard Drive
 	1021  Little Disk
@@ -6269,6 +6430,8 @@
 	9722  Keyboard
 	9731  MCK-600W/MCK-800USB Keyboard
 	9783  Wireless Keypad
+	9837  Targus Number Keypad
+	9862  Targus Number Keypad (Composite Device)
 	9881  IR receiver [VRC-1100 Vista MCE Remote Control]
 05a5  Sampo Technology Corp.
 05a6  Cisco Systems, Inc.
@@ -6385,6 +6548,7 @@
 	1101  Speakers
 	1105  Audio in LED Cinema Display
 	1107  Thunderbolt Display Audio
+	1112  FaceTime HD Camera (Display)
 	1201  3G iPod
 	1202  iPod 2G
 	1203  iPod 4.Gen Grayscale 40G
@@ -6454,6 +6618,7 @@
 	8240  Built-in IR Receiver
 	8241  Built-in IR Receiver
 	8242  Built-in IR Receiver
+	8281  Bluetooth Host Controller
 	8286  Bluetooth Host Controller
 	8300  Built-in iSight (no firmware loaded)
 	8403  Internal Memory Card Reader
@@ -6910,6 +7075,7 @@
 	0723  GL827L SD/MMC/MS Flash Card Reader
 	0726  SD Card Reader
 	0727  microSD Reader/Writer
+	0731  GL3310 SATA 3Gb/s Bridge Controller
 	0736  microSD Reader/Writer
 	0760  USB 2.0 Card Reader/Writer
 	0761  Genesys Mass Storage Device
@@ -6961,7 +7127,9 @@
 05f7  RFC Distribution(s) PTE, Ltd
 05f9  PSC Scanning, Inc.
 	1104  Magellan 2200VS
+	2202  Point of Sale Handheld Scanner
 	2206  Datalogic Gryphon GFS4170
+	2601  Datalogin Magellan 1000i Barcode Scanner
 	2602  Datalogic Magellan 1100i Barcode Scanner
 	5204  Datalogic Gryphon GFS4170 (config mode)
 05fa  Siemens Telecommunications Systems, Ltd
@@ -7065,6 +7233,9 @@
 0622  Iotech, Inc.
 0623  Littelfuse, Inc.
 0624  Avocent Corp.
+	0248  Virtual Hub
+	0249  Virtual Keyboard/Mouse
+	0251  Virtual Mass Storage
 	0294  Dell 03R874 KVM dongle
 	0402  Cisco Virtual Keyboard and Mouse
 	0403  Cisco Virtual Mass Storage
@@ -7124,6 +7295,7 @@
 	1000  CD-ROM Drive
 	800d  TASCAM Portastudio DP-01FX
 	800e  TASCAM US-122L
+	801d  DR-100
 	8021  TASCAM US-122mkII
 	d001  CD-R/RW Unit
 	d002  CD-R/RW Unit
@@ -7156,6 +7328,7 @@
 	a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
 	c107  HP webcam [dv6-1190en]
 	d101  Acer CrystalEye Webcam
+	d217  HP TrueVision HD
 	e201  Lenovo Integrated Webcam
 	e203  Lenovo Integrated Webcam
 	e258  HP TrueVision HD Integrated Webcam
@@ -7183,7 +7356,7 @@
 0658  Sigma Designs, Inc.
 0659  Aethra
 065a  Optoelectronics Co., Ltd
-	0001  Barcode scanner / NLV-1001 (keyboard mode)
+	0001  Opticon OPR-2001 / NLV-1001 (keyboard mode)
 	0009  NLV-1001 (serial mode) / OPN-2001 [Opticon]
 065b  Tracewell Systems
 065e  Silicon Graphics
@@ -7377,6 +7550,7 @@
 	2517  Flash Disk Mass Storage Device
 	2528  Storage device (8gB thumb drive)
 	25a1  PL25A1 Host-Host Bridge
+	2773  PL2773 SATAII bridge controller
 	3400  Hi-Speed Flash Disk with TruePrint AES3400
 	3500  Hi-Speed Flash Disk with TruePrint AES3500
 	3507  PL3507 ATAPI6 Bridge
@@ -7641,6 +7815,11 @@
 06bc  Oki Data Corp.
 	000b  Okipage 14ex Printer
 	0027  Okipage 14e
+	00f7  OKI B4600 Mono Printer
+	015e  OKIPOS 411/412 POS Printer
+	01c9  OKI B430 Mono Printer
+	020b  OKI ES4140 Mono Printer
+	02bb  OKI PT390 POS Printer
 	0a91  B2500MFP (printer+scanner)
 	3801  B6100 Laser Printer
 06bd  AGFA-Gevaert NV
@@ -7761,6 +7940,7 @@
 	0622  LapLink Gold USB-USB Bridge [net1080]
 06d1  Daewoo Electronics Co., Ltd
 06d3  Mitsubishi Electric Corp.
+	0284  FX-USB-AW/-BD RS482 Converters
 	0380  CP8000D Port
 	0381  CP770D Port
 	0385  CP900D Port
@@ -7800,10 +7980,12 @@
 	0014  Prolink Winscan Pro 2448U
 06de  Heisei Electronics Co., Ltd
 06e0  Multi-Tech Systems, Inc.
+	0319  MT9234ZBA-USB MultiModem ZBA
 	f101  MT5634ZBA-USB MultiModemUSB (old firmware)
 	f103  MT5634MU MultiMobileUSB
 	f104  MT5634ZBA-USB MultiModemUSB (new firmware)
 	f107  MT5634ZBA-USB-V92 MultiModemUSB
+	f120  MT9234ZBA-USB-CDC-ACM-XR MultiModem ZBA CDC-ACM-XR
 06e1  ADS Technologies, Inc.
 	0008  UBS-10BT Ethernet [klsi]
 	0009  UBS-10BT Ethernet
@@ -8405,15 +8587,21 @@
 	8911  ScanHex SX-35c
 0798  Optelec
 	0001  Braille Voyager
+	0640  BC640
+	0680  BC680
 0799  Altera
 	7651  Programming Unit
 079b  Sagem
+	0024  MSO300/MSO301 Fingerprint Sensor
+	0026  MSO350/MSO351 Fingerprint Sensor & SmartCard Reader
 	0027  USB-Serial Controller
 	002f  Mobile
 	0030  Mobile Communication Device
 	0042  Mobile
+	0047  CBM/MSO1300 Fingerprint Sensor
 	004a  XG-760A 802.11bg
 	004b  Wi-Fi 11g adapter
+	0052  MSO1350 Fingerprint Sensor & SmartCard Reader
 	0056  Agfa AP1100 Photo Printer
 	005d  Mobile Mass Storage
 	0062  XG-76NA 802.11bg
@@ -8538,12 +8726,17 @@
 	0114  C-350Z Camera
 	0118  Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW
 	0184  P-S100 port
+	0202  Foot Switch RS-26
 	0203  Digital Voice Recorder DW-90
 	0206  Digital Voice Recorder DS-330
 	0207  Digital Voice Recorder & Camera W-10
 	0209  Digital Voice Recorder DM-20
+	020b  Digital Voice Recorder DS-4000
 	020d  Digital Voice Recorder VN-240PC
+	0211  Digital Voice Recorder DS-2300
+	0218  Foot Switch RS-28
 	0244  Digital Voice Recorder VN-8500PC
+	024f  Digital Voice Recorder DS-7000
 	0280  m:robe 100
 07b5  Mega World International, Ltd
 	0017  Joystick
@@ -8575,6 +8768,7 @@
 	420a  UF200 Ethernet
 	5301  GW-US54ZGL 802.11bg
 	6001  802.11bg
+	8188  AboCom Systems Inc [WN2001 Prolink Wireless-N Nano Adapter]
 	a001  WUG2200 802.11g Wireless Adapter [Envara WiND512]
 	abc1  DU-E10 Ethernet [pegasus]
 	b000  BWU613
@@ -9044,6 +9238,7 @@
 	1002  Ethernet
 	1020  FA101 Fast Ethernet USB 1.1
 	1040  FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x]
+	1100  Managed Switch M4100 series, M5300 series, M7100 series
 	4110  MA111(v1) 802.11b Wireless [Intersil Prism 3.0]
 	4200  WG121(v1) 54 Mbps Wireless [Intersil ISL3886]
 	4210  WG121(v2) 54 Mbps Wireless [Intersil ISL3886]
@@ -9335,7 +9530,7 @@
 	0301  RNIS
 08e4  Pioneer Corp.
 08e5  Litronic
-08e6  Gemplus
+08e6  Gemalto (was Gemplus)
 	0001  GemPC-Touch 430
 	0430  GemPC430 SmartCard Reader
 	0432  GemPC432 SmartCard Reader
@@ -9349,6 +9544,7 @@
 	34ec  Compact Smart Card Reader Writer
 	4433  GemPC433-Swap
 	5501  GemProx-PU Contactless Smart Card Reader
+	5503  Prox-DU Contactless Interface
 	ace0  UA HYBRID TOKEN
 08e7  Pan-International Wire & Cable
 08e8  Integrated Memory Logic
@@ -9502,8 +9698,8 @@
 	0001  Hard Drive Adapter (TPP)
 	0002  SigmaDrive Adapter (TPP)
 0906  Faraday Technology Corp.
-0908  ShenZhen SANZHAI Technology Co.,Ltd
-	2701  Spy Pen VGA
+0908  Siemens AG
+	2701  ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
 0909  Audio-Technica Corp.
 090a  Trumpion Microelectronics, Inc.
 	1001  T33520 Flash Card Controller
@@ -9582,9 +9778,9 @@
 	2295  Colorado 300
 	22b6  eTrex Vista HCx (Mass Storage mode)
 	231b  Oregon 400t
-	2353  Nüvi 205T
+	2353  Nüvi 205T
 	2380  Oregon series
-	23cc  nüvi 1350
+	23cc  nüvi 1350
 	2459  GPSmap 62/78 series
 	2519  eTrex 30
 	2535  Edge 800
@@ -9647,13 +9843,14 @@
 	0509  BT EDR Dongle
 	0706  PocketPC e740
 	0707  Pocket PC e330 Series
-	0708  Pocket PC e350Â Series
+	0708  Pocket PC e350 Series
 	0709  Pocket PC e750 Series
 	070a  Pocket PC e400 Series
 	070b  Pocket PC e800 Series
 	0a07  WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]
 	0b05  PX1220E-1G25 External hard drive
 	0b09  PX1396E-3T01 External hard drive
+	0b1a  STOR.E ALU 2S
 	1300  Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port
 	1301  Wireless Broadband (CDMA EV-DO) Minicard Status Port
 	1302  Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port
@@ -9716,6 +9913,7 @@
 0933  Quantum Corp.
 0934  Spirent Communications
 0936  NuTesla
+	000c  Rhythmedics 6 BioData Integrator
 	0030  Composite Device, Mass Storage Device (Flash Drive) amd HID
 	003c  Rhythmedics HID Bootloader
 0939  Lumberg, Inc.
@@ -9732,6 +9930,7 @@
 	2471  SoC PC-Camera
 	2500  USB Optical Mouse
 	2510  Optical Mouse
+	2521  Optical Mouse
 	2600  Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508
 	2601  SPC 610NC Laptop Camera
 	2603  PAC7312 Camera
@@ -9812,6 +10011,7 @@
 0955  NVidia Corp.
 	7030  Tegra 3 (recovery mode)
 	7100  Notion Ink Adam
+	7820  Tegra 2 AC100 developer mode
 	b400  SHIELD (debug)
 	b401  SHIELD
 0956  BSquare Corp.
@@ -9850,6 +10050,7 @@
 0977  Lightsurf Technologies
 0978  Beckhoff GmbH
 0979  Jeilin Technology Corp., Ltd
+	0222  Keychain Display
 	0224  JL2005A Toy Camera
 	0226  JL2005A Toy Camera
 	0227  JL2005B/C/D Toy Camera
@@ -9961,7 +10162,8 @@
 	032b  Wireless Mouse (Battery Free)
 	8090  X-718BK Oscar Optical Gaming Mouse
 	9033  X-718BK Optical Mouse
-	9090  XL-750BK Laser Mouse
+	9066  F3 V-Track Gaming Mouse
+	9090  XL-730K / XL-750BK / XL-755BK Mice
 09db  Measurement Computing Corp.
 	0075  MiniLab 1008
 	0076  PMD-1024
@@ -10231,6 +10433,7 @@
 	0009  LP2844 Printer
 	0081  GK420t Label Printer
 	008b  HC100 wristbands Printer
+	00d1  Zebra GC420d Label Printer
 	930a  Printer
 0a62  MPMan
 	0010  MPMan MP-F40 MP3 Player
@@ -10408,6 +10611,7 @@
 	c303  Saturn USB 2.0 Camera
 	c326  Namuga 1.3M Webcam
 	c33f  Webcam
+	c429  Lenovo ThinkCentre Web Camera
 0ac9  Micro Solutions, Inc.
 	0000  Backpack CD-ReWriter
 	0001  BACKPACK  2 Cable
@@ -10423,6 +10627,7 @@
 	0300  IDT1221U RS-232 Adapter
 	0401  Spectrum III Hybrid Smartcard Reader
 	0630  Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
+	0810  SecurePIN (IDPA-506100Y) PIN Pad
 0ace  ZyDAS
 	1201  ZD1201 802.11b
 	1211  ZD1211 802.11g
@@ -10557,8 +10762,10 @@
 0b0d  ProjectLab
 	0000  CenturyCD
 0b0e  GN Netcom
+	0420  Jabra SPEAK 510
 	1022  Jabra PRO 9450, Type 9400BS (DECT Headset)
 	620c  Jabra BT620s
+	9330  Jabra GN9330 Headset
 0b0f  AVID Technology
 0b10  Pcally
 0b11  I Tech Solutions Co., Ltd
@@ -10660,6 +10867,10 @@
 0b63  ADLink Technology, Inc.
 0b64  Wonderful Wire Cable Co., Ltd
 0b65  Expert Magnetics Corp.
+0b66  Cybiko Inc.
+	0041  Xtreme
+0b67  Fairbanks Scales
+	555e  SCB-R9000
 0b69  CacheVision
 0b6a  Maxim Integrated Products
 	a132  WUP-005 [Nintendo Wii U Pro Controller]
@@ -10829,7 +11040,7 @@
 	0a4d  PocketPC Sync
 	0a4e  PocketPC Sync
 	0a4f  PocketPC Sync
-	0a50  HTC SmartPhone Sync
+	0a50  SmartPhone (MTP)
 	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
 	0a52  SmartPhone Sync
 	0a53  SmartPhone Sync
@@ -10952,9 +11163,11 @@
 	0502  ST3300601CB-RK 300 GB External Hard Drive
 	0503  ST3250824A [Barracuda 7200.9]
 	2000  Storage Adapter V3 (TPP)
+	2100  FreeAgent Go
 	2200  FreeAgent Go FW
 	2300  Expansion Portable
 	2320  USB 3.0 bridge [Portable Expansion Drive]
+	3008  FreeAgent Desk 1TB
 	3320  SRD00F2 [Expansion Desktop Drive]
 	3332  Expansion
 	5021  FreeAgent GoFlex USB 2.0
@@ -10964,6 +11177,8 @@
 	5121  FreeAgent GoFlex
 	5161  FreeAgent GoFlex dock
 	a003  Backup Plus
+	a0a1  Backup Plus Desktop
+	a0a4  Backup Plus Desktop Drive
 0bc3  IPWireless, Inc.
 	0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -11032,6 +11247,7 @@
 	8174  RTL8192SU 802.11n WLAN Adapter
 	8176  RTL8188CUS 802.11n WLAN Adapter
 	8178  RTL8192CU 802.11n WLAN Adapter
+	8179  RTL8188EUS 802.11n Wireless Network Adapter
 	817f  RTL8188RU 802.11n WLAN Adapter
 	8187  RTL8187 Wireless Adapter
 	8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
@@ -11084,6 +11300,7 @@
 	1009  Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887]
 	100c  Keyboard FSC KBPC PX
 	100f  miniCard D2301 802.11bg Wireless Module [SiS 163U]
+	1017  Keyboard KB SCR
 0bfd  Kvaser AB
 	0004  USBcan II
 	000b  Leaf Light HS
@@ -11160,7 +11377,7 @@
 	3bfa  pcProx Card Reader
 0c2e  Metrologic Instruments
 	0007  Metrologic MS7120 Barcode Scanner (IBM SurePOS mode)
-	0200  Metrologic Scanner
+	0200  MS7120 Barcode Scanner
 	0204  Metrologic MS7120 Barcode Scanner (keyboard mode)
 	0206  Metrologic MS4980 Barcode Scanner
 	0700  Metrologic MS7120 Barcode Scanner (uni-directional serial mode)
@@ -11303,12 +11520,14 @@
 	62c0  Sonix USB 2.0 Camera
 	62e0  MSI Starcam Racer
 	6310  Sonix USB 2.0 Camera
+	6341  Defender G-Lens 2577 HD720p Camera
 	63e0  Sonix Integrated Webcam
 	63f1  Integrated Webcam
 	63f8  Sonix Integrated Webcam
 	6409  Webcam
 	6413  Integrated Webcam
 	6417  Integrated Webcam
+	6419  Integrated Webcam
 	641d  1.3 MPixel Integrated Webcam
 	6480  Sonix 1.3 MP Laptop Integrated Webcam
 	648b  Integrated Webcam
@@ -11467,7 +11686,7 @@
 	3050  EZ710 Smart Card Reader
 0ca7  Information Systems Laboratories
 0cad  Motorola CGISS
-	9001  PowerPad Pocket PCÂ Device
+	9001  PowerPad Pocket PC Device
 0cae  Ascom Business Systems, Ltd
 0caf  Buslink
 	2507  Hi-Speed USB-to-IDE Bridge Controller
@@ -11518,7 +11737,7 @@
 	0035  Miditech Play'n Roll
 	0036  Cinergy 250 Audio
 	0037  Cinergy 250 Audio
-	0038  Cinergy T² DVB-T Receiver
+	0038  Cinergy T² DVB-T Receiver
 	0039  Grabster AV 400
 	003b  Cinergy 400
 	003c  Grabster AV 250
@@ -11527,7 +11746,7 @@
 	004e  Cinergy T XS
 	004f  Cinergy Analog XS
 	0055  Cinergy T XE (Version 1, AF9005)
-	005c  Cinergy T²
+	005c  Cinergy T²
 	0069  Cinergy T XE (Version 2, AF9015)
 	006b  Cinergy HT PVR (EU)
 	0072  Cinergy Hybrid T
@@ -11540,6 +11759,7 @@
 	00a5  Cinergy Hybrid Stick
 	00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
 	00b3  NOXON DAB/DAB+ Stick
+	00e0  NOXON DAB/DAB+ Stick V2
 	10a7  TerraTec G3
 0cd4  Bang Olufsen
 	0101  BeolinkPC2
@@ -11591,7 +11811,7 @@
 	0005  AR5523
 	0006  AR5523 (no firmware)
 	1001  Thomson TG121N [Atheros AR9001U-(2)NG]
-	1002  TP-Link TL-WN821N v2 802.11n [Atheros AR9170]
+	1002  TP-Link TL-WN821N v2 / TL-WN822N v1 802.11n [Atheros AR9170]
 	1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
 	1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
 	20ff  AR7010 (no firmware)
@@ -11599,7 +11819,7 @@
 	3002  AR3011 Bluetooth
 	3005  AR3011 Bluetooth
 	3008  Bluetooth (AR3011)
-	7015  TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287]
+	7015  TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]
 	9170  AR9170 802.11n
 	9271  AR9271 802.11n
 	b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
@@ -11697,6 +11917,7 @@
 0d4f  EADS Airbus France
 0d50  Cleware GmbH
 	0011  USB-Temp2 Thermometer
+	0040  F4 foot switch
 0d51  Volex (Asia) Pte., Ltd
 0d53  HMI Co., Ltd
 0d54  Holon Corp.
@@ -12215,6 +12436,7 @@
 	1332  5 IMT
 	1416  32 IT
 	1417  A43 IT
+	14ad  97 Titanium HD
 	150e  80 G9
 0e7b  On-Tech Industry Co., Ltd
 0e7e  Gmate, Inc.
@@ -12400,6 +12622,7 @@
 0f52  Wing Key Electrical Co., Ltd
 0f53  Dongguan White Horse Cable Factory, Ltd
 0f54  Kawai Musical Instruments Mfg. Co., Ltd
+	0101  MP6 Stage Piano
 0f55  AmbiCom, Inc.
 0f5c  Prairiecomm, Inc.
 0f5d  NewAge International, LLC
@@ -12498,6 +12721,7 @@
 	0112  W995 Walkman Phone
 	015a  Xperia Pro [Media Transfer Protocol]
 	0166  Xperia Mini Pro
+	0167  ST15i (Xperia mini)
 	0169  Xperia S
 	0172  Xperia P
 	0177  Xperia Ion [Mass Storage]
@@ -12513,9 +12737,12 @@
 	3138  Xperia X10 mini pro
 	3149  Xperia X8
 	5177  Xperia Ion [Debug Mode]
+	518c  C1605 [Xperia E dual] MTD mode
 	614f  Xperia X12 (debug mode)
 	6166  Xperia Mini Pro
+	618c  C1605 [Xperia E dual] MSC mode
 	715a  Xperia Pro [Tethering]
+	7166  Xperia Mini Pro (Tethering mode)
 	7177  Xperia Ion [Tethering]
 	8004  9000 Phone [Mass Storage]
 	adde  Boot loader
@@ -12570,6 +12797,8 @@
 	1008  Mini stick Suunto
 0fd0  Tulip Computers B.V.
 0fd1  Giant Electronics Ltd.
+0fd2  Seac Banche
+	0001  RDS 6000
 0fd4  Tenovis GmbH & Co., KG
 0fd5  Direct Access Technology, Inc.
 0fd9  Elgato Systems GmbH
@@ -12611,6 +12840,8 @@
 0ff7  CHI SHING Computer Accessories Co., Ltd
 0ffc  Clavia DMI AB
 	0021  Nord Stage 2
+0ffd  EarlySense
+	ff00  OEM
 0fff  Aopen, Inc.
 1000  Speed Tech Corp.
 1001  Ritronics Components (S) Pte., Ltd
@@ -12626,7 +12857,14 @@
 	618f  Ally/Optimus One
 	61c6  Vortex (msc)
 	61cc  Optimus S
+	61f1  Optimus Android Phone [LG Software mode]
+	61f9  V909 G-Slate
 	61fc  Optimus 3
+	61fe  Optimus Android Phone [USB tethering mode]
+	6300  Optimus Android Phone
+	631c  Optimus Android Phone [MTP mode]
+	631e  Optimus Android Phone [Camera/PTP mode]
+	6356  Optimus Android Phone [Virtual CD mode]
 	6800  CDMA Modem
 	7000  LG LDP-7024D(LD)USB
 	a400  Renoir (KC910)
@@ -12698,6 +12936,7 @@
 	0068  3,5'' HDD case MD-231
 1038  Ideazon, Inc.
 	0100  Zboard
+	1361  Sensei
 1039  devolo AG
 	0824  1866 802.11bg [Texas Instruments TNETW1450]
 	2140  dsl+ 1100 duo
@@ -12747,6 +12986,9 @@
 	0009  RE-BL PlayStation 3 IR-to-Bluetooth converter
 1050  Yubico.com
 	0010  Yubikey
+	0110  Yubikey NEO OTP
+	0111  Yubikey NEO OTP+CCID
+	0211  Gnubby
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
 	5004  DSL 7420 Loader
@@ -12761,7 +13003,8 @@
 	0702  Passport External HDD
 	0704  Passport External HDD
 	070a  My Passport Essential SE
-	071a  My Passport 1TB
+	071a  My Passport
+	0730  My Passport
 	0740  My Passport
 	0742  My Passport Essential SE
 	0748  My Passport 1TB USB 3.0
@@ -12880,6 +13123,7 @@
 107f  KidzMouse, Inc.
 1082  Shin-Etsukaken Co., Ltd
 1083  Canon Electronics, Inc.
+	161b  DR-2010C Scanner
 	162c  P-150 Scanner
 1084  Pantech Co., Ltd
 108a  Chloride Power Protection
@@ -12951,6 +13195,7 @@
 	8789  C8051F34x Extender & EDID MGR [EMX-DVI]
 	87be  C8051F34x HDMI Audio Extractor [EMX-HD-AUD]
 	8863  C8051F34x Bootloader
+	8897  C8051F38x HDMI Splitter [UHBX]
 	ea60  CP210x UART Bridge / myAVR mySmartUSB light
 	ea61  CP210x UART Bridge
 	ea70  CP210x UART Bridge
@@ -12963,6 +13208,7 @@
 	1101  MP3 Player
 10cd  Kycon, Inc.
 10ce  Silicon Labs
+	000e  Shinko/Sinfonia CHC-S2145
 	ea6a  MobiData EDGE USB Modem
 10cf  Velleman Components, Inc.
 	2011  R-Engine MPEG2 encoder/decoder
@@ -12976,6 +13222,7 @@
 	0301  CP42 - Communication Processor
 10d4  Man Boon Manufactory, Ltd
 10d5  Uni Class Technology Co., Ltd
+	0004  PS/2 Converter
 	5552  KVM Human Interface Composite Device (Keyboard/Mouse ports)
 	55a2  2Port KVMSwitcher
 10d6  Actions Semiconductor Co., Ltd
@@ -13215,11 +13462,15 @@
 	524e  RoadMate 1475T
 	5260  Triton Handheld GPS Receiver (300/400/500/1500/2000)
 1210  DigiTech
+	0016  RP500 Guitar Multi-Effects Processor
 	001b  RP155 Guitar Multi-Effects Processor
 	001c  RP255 Guitar Multi-Effects Processor
 121e  Jungsoft Co., Ltd
 	3403  Muzio JM250 Audio Player
 1223  SKYCABLE ENTERPRISE. CO., LTD.
+1228  Datapaq Limited
+	0012  Q18 Data Logger
+	0015  TPaq21/MPaq21 Datalogger
 1230  Chipidea-Microelectronica, S.A.
 1233  Denver Electronics
 	5677  FUSB200 mp3 player
@@ -13368,17 +13619,20 @@
 	14c3  K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard
 	14c8  K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard
 	14c9  K3770 3G Modem
+	14cf  K3772
 	14d1  K3770 3G Modem (Mass Storage Mode)
 	14f1  Gobi 3000 HSPA+ Modem
 	1501  Pulse
 	1505  E398 LTE/UMTS/GSM Modem/Networkcard
-	1506  E398 LTE/UMTS/GSM Modem/Networkcard
+	1506  Modem/Networkcard
 	150a  E398 LTE/UMTS/GSM Modem/Networkcard
 	1520  K3765 HSPA
 	1521  K4505 HSPA+
+	155a  R205 Mobile WiFi (CD-ROM mode)
 	1805  AT&T Go Phone U2800A phone
 	1c05  E173s 3G broadband stick (modem on)
 	1c0b  E173s 3G broadband stick (modem off)
+	1c20  R205 Mobile WiFi (Charging)
 	1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
 	380b  WiMAX USB modem(s)
 12d2  LINE TECH INDUSTRIAL CO., LTD.
@@ -13514,6 +13768,7 @@
 	0011  VFS5011 Fingerprint Reader
 	0018  Fingerprint scanner
 	003c  VFS471 Fingerprint Reader
+	003d  VFS491
 138e  Jungo LTD
 	9000  Raisonance S.A. STM32 ARM evaluation board
 1390  TOMTOM B.V.
@@ -13557,7 +13812,7 @@
 	0030  Multimix 8
 13b3  Nippon Dics Co., Ltd.
 13ba  PCPlay
-	0001  König Electronic CMP-KEYPAD12 Numeric Keypad
+	0001  König Electronic CMP-KEYPAD12 Numeric Keypad
 	0017  PS/2 Keyboard+Mouse Adapter
 	0018  Barcode PCP-BCG4209
 13be  Ricoh Printing Systems, Ltd.
@@ -13661,6 +13916,9 @@
 1402  Bowe Bell & Howell
 1403  Sitronix
 	0001  Digital Photo Frame
+1409  IDS Imaging Development Systems GmbH
+	1000  generic (firmware not loaded yet)
+	1485  uEye UI1485
 140e  Telechips, Inc.
 	b011  TCC780X-based player (USB Boot mode)
 	b021  TCC77X-based players (USB Boot mode)
@@ -13712,6 +13970,7 @@
 	0007  Development board JTAG
 1446  X.J.GROUP
 	6a73  Stamps.com Model 510 5LB Scale
+	6a78  DYMO Endicia 75lb Digital Scale
 1453  Radio Shack
 	4026  26-183 Serial Cable
 1456  Extending Wire & Cable Co., Ltd.
@@ -13750,6 +14009,7 @@
 	e02c  Infrared Receiver
 	e03a  eHome Infrared Receiver
 	e03c  eHome Infrared Receiver
+	e03d  2 Channel Audio
 	e03e  Infrared Receiver [IR605A/Q]
 147e  Upek
 	1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
@@ -13844,6 +14104,8 @@
 14d8  JAMER INDUSTRIES CO., LTD.
 14dd  Raritan Computer, Inc.
 	1007  D2CIM-VUSB KVM connector
+14e0  WiNRADiO Communications
+	0501  WR-G528e 'CHEETAH'
 14e1  Dialogue Technology Corp.
 	5000  PenMount 5000 Touch Controller
 14e5  SAIN Information & Communications Co., Ltd.
@@ -13886,6 +14148,7 @@
 152a  Thesycon Systemsoftware & Consulting GmbH
 152d  JMicron Technology Corp. / JMicron USA Technology Corp.
 	0539  JMS539 SuperSpeed SATA II 3.0G Bridge
+	0770  Alienware Integrated Webcam
 	2329  JM20329 SATA Bridge
 	2335  ATA/ATAPI Bridge
 	2336  Hard Disk Drive
@@ -13906,6 +14169,7 @@
 	0017  RZ01-0035 Laser Gaming Mouse [Imperator]
 	001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
 	0024  Razer Mamba
+	002e  RZ01-0058 Gaming Mouse [Naga]
 	0036  RZ01-0075, Gaming Mouse [Naga Hex]
 	0101  Copperhead Mouse
 	0102  Tarantula Keyboard
@@ -13960,6 +14224,7 @@
 	0820  SmartPocket Class Device
 1598  Kunshan Guoji Electronics Co., Ltd.
 15a2  Freescale Semiconductor, Inc.
+	0038  9S08JS Bootloader
 	003b  USB2CAN Application for ColdFire DEMOJM board
 	0042  OSBDM - Debug Port
 	004f  i.MX28 SystemOnChip in RecoveryMode
@@ -14035,6 +14300,7 @@
 	2007  RSA SecurID (R) Authenticator
 15e4  Numark
 	0024  Mixtrack
+	0140  ION VCR 2 PC / Video 2 PC
 15e8  SohoWare
 	9100  NUB100 Ethernet [pegasus]
 	9110  10/100 USB Ethernet
@@ -14368,9 +14634,11 @@
 	0504  RETRO Innovations ZoomFloppy
 	054b  GrauTec ReelBox OLED Display (external)
 	05be  EasyLogic Board
+	06f9  Gabotronics Xminilab
 	0753  Digistump DigiSpark
 	075c  AB-1.x UAC1 [Audio Widget]
 	075d  AB-1.x UAC2 [Audio Widget]
+	080a  S2E1 Interface
 16d3  Frontline Test Equipment, Inc.
 16d5  AnyDATA Corporation
 	6202  CDMA/UMTS/GPRS modem
@@ -14476,6 +14744,8 @@
 	aa11  Web Cam
 1753  GERTEC Telecomunicacoes Ltda.
 	c901  PPC900 Pinpad Terminal
+1756  ENENSYS Technologies
+	0006  DiviPitch
 1759  LucidPort Technology, Inc.
 1761  ASUSTek Computer, Inc. (wrong ID)
 	0b05  802.11n Network Adapter (wrong ID - swapped vendor and device)
@@ -14519,8 +14789,11 @@
 	0101  UB1 boundary microphone
 	0200  StudioDock monitors (internal hub)
 	0201  StudioDock monitors (audio)
+	0210  StudioGT monitors
 	0301  Q2U handheld microphone with XLR
 	0302  GoMic compact condenser microphone
+	0304  Q2U handheld mic with XLR
+	0305  GoMic compact condenser mic
 	0310  Meteor condenser microphone
 17a4  Concept2
 	0001  Performance Monitor 3
@@ -14532,6 +14805,8 @@
 	0005  M-Bus Master MultiPort 250D
 17b3  Grey Innovation
 	0004  Linux-USB Midi Gadget
+17b5  Lunatone
+	0010  MFT Sensor
 17ba  SAURIS GmbH
 	0001  SAU510-USB [no firmware]
 	0510  SAU510-USB and SAU510-USB plus JTAG Emulators
@@ -14559,6 +14834,7 @@
 17d3  Korea Techtron Co., Ltd.
 17e9  DisplayLink
 	0051  USB VGA Adaptor
+	030b  HP T100
 	0377  Plugable UD-160-A (M)
 	0378  Plugable UGA-2K-A
 	0379  Plugable UGA-125
@@ -14567,10 +14843,12 @@
 	037c  Plugable DC-125
 	037d  Plugable USB2-HDMI-165
 	430a  HP Port Replicator (Composite Device)
+	4312  S2340T
 17eb  Cornice, Inc.
 17ef  Lenovo
 	1003  Integrated Smart Card Reader
 	1004  Integrated Webcam
+	1008  Hub
 	100a  ThinkPad Mini Dock Plus Series 3
 	3815  ChipsBnk 2GB USB Stick
 	4802  Lenovo Vc0323+MI1310_SOC Camera
@@ -14585,8 +14863,10 @@
 	4813  Integrated Webcam [R5U877]
 	4814  Integrated Webcam [R5U877]
 	4815  Integrated Webcam [R5U877]
+	4816  Integrated Webcam
 	481c  Integrated Webcam
 	481d  Integrated Webcam
+	6004  ISD-V4 Tablet Pen
 	6007  Smartcard Keyboard
 	6009  ThinkPad Keyboard with TrackPoint
 	6014  Mini Wireless Keyboard N5901
@@ -14632,6 +14912,7 @@
 1873  Navilock
 	ee93  EasyLogger
 187c  Alienware Corporation
+	0511  AlienFX Mobile lighting
 	0600  Dual Compatible Game Pad
 187f  Siano Mobile Silicon
 	0010  Stallar Board
@@ -14657,7 +14938,7 @@
 	0227  Pocket Hard Drive
 	022b  Portable Hard Drive (Store'n'Go)
 	0237  Portable Harddrive (500 GB)
-	0302  32GB Flash Drive
+	0302  Flash Drive
 18b1  Petalynx
 	0037  Maxter Remote Control
 18b4  e3C Technologies
@@ -14686,15 +14967,17 @@
 	4e22  Nexus S (debug)
 	4e24  Nexus S (tether)
 	4e40  Nexus 7 (fastboot)
-	4e41  ASUS Nexus 7 (MTP modus)
+	4e41  Nexus 7 (MTP)
 	4e42  Nexus 7 (debug)
-	4e43  ASUS Nexus 7 (PTP modus)
-	4ee1  Nexus 4
+	4e43  Nexus 7 (PTP)
+	4ee1  Nexus 4 / 10
 	4ee2  Nexus 4 (debug)
 	4ee3  Nexus 4 (tether)
 	4ee4  Nexus 4 (debug + tether)
 	7102  Toshiba Thrive tablet
 	b004  Pandigital / B&N Novel 9" tablet
+	d109  LG G2x MTP
+	d10a  LG G2x MTP (debug)
 18d5  Starline International Group Limited
 18d9  Kaba
 	01a0  B-Net 91 07
@@ -14725,10 +15008,13 @@
 190d  Motorola GSG
 1914  Alco Digital Devices Limited
 1915  Nordic Semiconductor ASA
+	000c  Wireless Desktop nRF24L01 CX-1766
 	2233  Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505]
 	2234  Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886]
 	2235  Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886]
 	2236  Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3]
+1923  FitLinxx
+	0002  Personal SyncPoint
 1926  NextWindow
 	0003  1900 HID Touchscreen
 	0006  1950 HID Touchscreen
@@ -14758,6 +15044,7 @@
 	0085  1950 HID Touchscreen
 	0086  1950 HID Touchscreen
 	0087  1950 HID Touchscreen
+	0dc2  HID Touchscreen
 192f  Avago Technologies, Pte.
 	0000  Mouse
 	0416  ADNS-5700 Optical Mouse Controller (3-button)
@@ -14789,6 +15076,7 @@
 	0301  AudioBox
 1951  Hyperstone AG
 1953  Ironkey Inc.
+	0202  S200 2GB Rev. 1
 1954  Radiient Technologies
 195d  Itron Technology iONE
 	7002  Libra-Q11 IR remote
@@ -14868,6 +15156,8 @@
 	2000  MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
 	fff2  Gobi Wireless Modem (QDL mode)
 	fff3  Gobi Wireless Modem
+19db  KFI Printers
+	02f1  NAUT324C
 19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
 19e8  Industrial Technology Research Institute
 19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
@@ -14878,6 +15168,7 @@
 19ff  Dynex
 	0102  1.3MP Webcam
 	0201  Rocketfish Wireless 2.4G Laser Mouse
+	0238  DX-WRM1401 Mouse
 1a08  Bellwood International, Inc.
 1a0a  USB-IF non-workshop
 	badd  USB OTG Compliance test device
@@ -14895,7 +15186,7 @@
 	0802  Gamepad
 1a36  Biwin Technology Ltd.
 1a40  Terminus Technology Inc.
-	0101  4-Port HUB
+	0101  Hub
 	0201  FE 2.1 7-port Hub
 1a41  Action Electronics Co., Ltd.
 1a44  VASCO Data Security International
@@ -14912,6 +15203,8 @@
 1a72  Physik Instrumente
 	1008  E-861 PiezoWalk NEXACT Controller
 1a79  Bayer Health Care LLC
+	6002  Contour
+	7410  Contour Next
 1a7b  Lumberg Connect  GmbH & Co. KG
 1a7c  Evoluent
 	0068  VerticalMouse 3
@@ -14944,6 +15237,8 @@
 1ab1  Rigol Technologies
 	0588  DS1000 SERIES
 1acb  Salcomp Plc
+1acc  Midiplus Co, Ltd.
+	0103  AudioLink plus 4x4 2.9.28
 1ad1  Desay Wire Co., Ltd.
 1ad4  APS
 	0002  KM290-HRS
@@ -15086,9 +15381,34 @@
 1b47  Energizer Holdings, Inc.
 	0001  CHUSB Duo Charger (NiMH AA/AAA USB smart charger)
 1b48  Plastron Precision Co., Ltd.
+1b52  ARH Inc.
+	2101  FXMC Neural Network Controller
+	2102  FXMC Neural Network Controller V2
+	2103  FXMC Neural Network Controller V3
+	4101  Passport Reader CLR device
+	4201  Passport Reader PRM device
+	4202  Passport Reader PRM extension device
+	4203  Passport Reader PRM DSP device
+	4204  Passport Reader PRMC device
+	4205  Passport Reader CSHR device
+	4206  Passport Reader PRMC V2 device
+	4301  Passport Reader MRZ device
+	4302  Passport Reader MRZ DSP device
+	4303  Passport Reader CSLR device
+	4401  Card Reader
+	4501  Passport Reader RFID device
+	4502  Passport Reader RFID AIG device
+	6101  Neural Network Controller
+	6202  Fingerprint Reader device
+	6203  Fingerprint Scanner device
+	8101  Camera V1
+	8102  Recovery / Camera V2
+	8103  Camera V3
 1b59  K.S. Terminals Inc.
 1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
 1b65  The Hong Kong Standards and Testing Centre Ltd.
+1b71  Fushicai
+	3002  USBTV007 Video Grabber [EasyCAP]
 1b72  ATERGI TECHNOLOGY CO., LTD.
 1b73  Fresco Logic
 	1000  xHC1 Controller
@@ -15137,16 +15457,21 @@
 1bae  Vuzix Corporation
 	0002  VR920 Immersive Eyewear
 1bbb  T & A Mobile Phones
+	011e  Alcatel One Touch L100V / Telekom Speedstick LTE II
+	f017  Alcatel One Touch L100V / Telekom Speedstick LTE II
 1bc4  Ford Motor Co.
 1bc5  AVIXE Technology (China) Ltd.
-1bc7  Telit
+1bc7  Telit Wireless Solutions
 	0020  HE863
 	0021  HE910
+	0023  HE910-D ECM
 	1003  UC864-E
 	1004  UC864-G
 	1005  CC864-DUAL
 	1006  CC864-SINGLE
 	1010  DE910-DUAL
+	1011  CE910-DUAL
+	1200  LE920
 1bce  Contac Cable Industrial Limited
 1bcf  Sunplus Innovation Technology Inc.
 	0007  Optical Mouse
@@ -15156,6 +15481,7 @@
 	0c31  SPIF30x Serial-ATA bridge
 	2885  ASUS Webcam
 	2888  HP Universal Camera
+	2b83  Laptop Integrated Webcam FHD
 1bd0  Hangzhou Riyue Electronic Co., Ltd.
 1bd5  BG Systems, Inc.
 1bde  P-TWO INDUSTRIES, INC.
@@ -15217,7 +15543,7 @@
 1c7a  LighTuning Technology Inc.
 	0801  Fingerprint Reader
 1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
-1c83  Schomäcker GmbH
+1c83  Schomäcker GmbH
 	0001  RS150 V2
 1c87  2N TELEKOMUNIKACE a.s.
 1c88  Somagic, Inc.
@@ -15241,6 +15567,7 @@
 1cbe  Luminary Micro Inc.
 	00fd  In-Circuit Debug Interface
 	00ff  Stellaris ROM DFU Bootloader
+	0166  CANAL USB2CAN
 1cbf  FORTAT SKYMARK INDUSTRIAL COMPANY
 1cc0  PlantSense
 1cca  NextWave Broadband Inc.
@@ -15296,6 +15623,8 @@
 	000a  Dream Cheeky Mailbox Friends Alert
 	000d  Dream Cheeky Big Red Button
 	0013  Dream Cheeky LED Message Board
+1d45  Touch
+	1d45  Foxlink Optical touch sensor
 1d4d  PEGATRON CORPORATION
 	0002  Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device
 	000c  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
@@ -15303,6 +15632,7 @@
 1d50  OpenMoko, Inc.
 	5119  GTA01/GTA02 U-Boot Bootloader
 	602b  FPGALink
+	6053  Darkgame Controller
 1d57  Xenta
 	0005  Wireless Receiver (Keyboard and Mouse)
 	0006  Wireless Receiver (RC Laser Pointer)
@@ -15325,6 +15655,8 @@
 	0104  Multifunction Composite Gadget
 	0105  FunctionFS Gadget
 	0200  Qemu Audio Device
+1d90  Citizen
+	201e  PPU-700
 1de1  Actions Microelectronics Co.
 	1101  Generic Display Device (Mass storage mode)
 	c101  Generic Display Device
@@ -15344,7 +15676,7 @@
 	0402  FTDI232 [EasyPort]
 	0403  FTDI232 [EasyPort Mini]
 	0404  FTDI232 [Netzteil-GL]
-	0405  FTDI232 [MotorPrüfstand]
+	0405  FTDI232 [MotorPrüfstand]
 	0406  STM32F103 [EasyKit]
 	0407  LPC2378 [Robotino]
 	0408  LPC2378 [Robotino-Arm]
@@ -15368,6 +15700,7 @@
 	2030  2030 USB Keyboard
 1e68  TrekStor GmbH & Co. KG
 	001b  DataStation maxi g.u
+	0050  DataStation maxi light
 1e71  NZXT
 	0001  Avatar Optical Mouse
 1e74  Coby Electronics Corporation
@@ -15396,12 +15729,17 @@
 1ee8  ONDA COMMUNICATION S.p.a.
 	0014  MT833UP
 1ef6  EADS Deutschland GmbH
+	2233  Cassidian NH90 STTE
 	5064  FDR Interface
+	5523  Cassidian SSDC Adapter II
+	5545  Cassidian SSDC Adapter III
 	5648  RIU CSMU/BSD
 	564a  Cassidian RIU CSMU/BSD Simulator
 1f28  Cal-Comp
 	0020  CDMA USB Modem A600
 	0021  CD INSTALLER USB Device
+1f3a  Onda (unverified)
+	efe8  V972 tablet in flashing mode
 1f44  The Neat Company
 	0001  NM-1000 scanner
 1f48  H-TRONIC GmbH
@@ -15608,6 +15946,9 @@
 	648b  TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
 2101  ActionStar
 	0201  SIIG 4-to-2 Printer Switch
+2149  Advanced Silicon S.A.
+	211b  Touchscreen Controller
+	2703  TS58xxA/TC56xxA [CoolTouch]
 2162  Creative (?)
 	2031  Network Blaster Wireless Adapter
 	500c  DE5771 Modem Blaster
@@ -15626,10 +15967,17 @@
 	4050  AirStick joystick
 2227  SAMWOO Enterprise
 	3105  SKYDATA SKD-U100
+2232  Silicon Motion
+	1005  WebCam SCB-0385N
+	1028  WebCam SC-03FFL11939N
+	1029  WebCam SC-13HDL11939N
+	1037  WebCam SC-03FFM12339N
 2233  RadioShack Corporation
 	6323  USB Electronic Scale
 2237  Kobo Inc.
 	4161  eReader White
+228d  8D Technologies inc.
+	0001  Terminal Bike Key Reader
 22a6  Pie Digital, Inc.
 	ffff  PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB)
 22b8  Motorola PCS
@@ -16247,8 +16595,8 @@
 	2448  82801 PCI Bridge
 	3100  PRO/DSL 3220 Modem - WAN
 	3101  PRO/DSL 3220 Modem
-	3240  AnyPoint® 3240 Modem - WAN
-	3241  AnyPoint® 3240 Modem
+	3240  AnyPoint® 3240 Modem - WAN
+	3241  AnyPoint® 3240 Modem
 	8602  Miniature Card Slot
 	9303  Intel 8x930Hx Hub
 	9500  CE 9500 DVB-T
@@ -16898,7 +17246,7 @@ HUT 07  Keyboard
 	031  \ and | (Backslash and Bar)
 	032  # and ~ (Hash and Tilde, Non-US Keyboard near right shift)
 	033  ; and : (Semicolon and Colon)
-	034  ´ and " (Accent Acute and Double Quotes)
+	034  ´ and " (Accent Acute and Double Quotes)
 	035  ` and ~ (Accent Grace and Tilde)
 	036  , and < (Comma and Less)
 	037  . and > (Period and Greater)
@@ -18059,4 +18407,4 @@ VT 0302  Sequential Media
 VT 0400  External Vendor Specific
 VT 0401  Composite Video
 VT 0402  S-Video
-VT 0403  Component Video
\ No newline at end of file
+VT 0403  Component Video
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractUSB.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
similarity index 57%
rename from RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractUSB.java
rename to RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
index b9a40d6407..b7b8abc56d 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractUSB.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
@@ -38,14 +38,13 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
 /**
  * Loads a file that maps USB IDs to names of makes and models. Uses Linux USB info. 
- * This should be renamed because it isn't extracting.  It's just mapping IDs to names. 
  */
-class ExtractUSB {
-    private static final Logger logger = Logger.getLogger(ExtractUSB.class.getName());
+class UsbDeviceIdMapper {
+    private static final Logger logger = Logger.getLogger(UsbDeviceIdMapper.class.getName());
     private HashMap<String, USBInfo> devices;
     private static final String DataFile = "USB_DATA.txt";
 
-    public ExtractUSB() {
+    public UsbDeviceIdMapper() {
         try {
             loadDeviceMap();
         } catch (FileNotFoundException ex) {
@@ -57,12 +56,12 @@ class ExtractUSB {
     }
     
     /**
-     * Example inputs:
-     * Vid_XXXX&Pid_XXXX
-     * @param dev
+     * Parses the passed in device ID and returns info that includes make and model. 
+     * 
+     * @param dev String to parse (i.e.: Vid_XXXX&Pid_XXXX)
      * @return 
      */
-    public USBInfo get(String dev) {
+    public USBInfo parseAndLookup(String dev) {
         String[] dtokens = dev.split("[_&]");
         String vID = dtokens[1];
         String pID;
@@ -72,6 +71,7 @@ class ExtractUSB {
             pID = dtokens[3];
         }
         String key = vID + pID;
+        key = key.toUpperCase();
         if (!devices.containsKey(key)) {
             return new USBInfo(null, null);
         } else {
@@ -80,62 +80,78 @@ class ExtractUSB {
     }
 
     /**
-     * Reads the USB file.  Syntax of file: 
-     *
-     * # vendor  vendor_name
-     * #	device  device_name				<-- single tab
-     * #		interface  interface_name		<-- two tabs
+     * Reads the local USB txt file and stores in map.
+     * 
      * @throws FileNotFoundException
      * @throws IOException 
      */
     private void loadDeviceMap() throws FileNotFoundException, IOException {
         devices = new HashMap<>();
-        PlatformUtil.extractResourceToUserConfigDir(this.getClass(), DataFile);
+        PlatformUtil.extractResourceToUserConfigDir(this.getClass(), DataFile, false);
         try (Scanner dat = new Scanner(new FileInputStream(new java.io.File(PlatformUtil.getUserConfigDirectory() + File.separator + "USB_DATA.txt")))) {
+            /* Syntax of file: 
+             *
+             * # vendor  vendor_name
+             * #	device  device_name				<-- single tab
+             * #		interface  interface_name		<-- two tabs
+             */
             String line = dat.nextLine();
             while (dat.hasNext()) {
-                String dvc = "";
-                if (!(line.startsWith("#") || (line.equals("")))) {
-                    String[] tokens = line.split("[\\t\\s]+");
-                    String vID = tokens[0];
-                    for (int n = 1; n < tokens.length; n++) {
-                        dvc += tokens[n] + " ";
-                    }
-                    String pID = vID + "0000";
-                    USBInfo info = new USBInfo(dvc, null);
-                    
-                    // make an entry with just the vendor ID
-                    devices.put(pID, info);
-                    
-                    // get the later lines that have specific products
-                    line = dat.nextLine();
-                    if (line.startsWith("\t")) {
-                        while (dat.hasNext() && line.startsWith("\t")) {
-                            tokens = line.split("[\\t\\s]+");
-                            pID = vID + tokens[1];
-                            String device = "";
-                            line = dat.nextLine();
-                            for (int n = 2; n < tokens.length; n++) {
-                                device += tokens[n] + " ";
-                            }
-                            
-                            info = new USBInfo(dvc, device);
-                            //make an entry where the key is both the vendor and product IDs concatenated
-                            devices.put(pID, info);
-                        }
-                    }
-                } else {
+                
+                // comments
+                if ((line.startsWith("#")) || (line.equals(""))) {
                     line = dat.nextLine();
+                    continue;
                 }
+                
+                // stop once we've hitten the part of the file that starts to talk about class types
                 if (line.startsWith("C 00")) {
                     return;
                 }
+                
+                String dvc = "";
+                String[] tokens = line.split("[\\t\\s]+");
+                String vID = tokens[0];
+                for (int n = 1; n < tokens.length; n++) {
+                    dvc += tokens[n] + " ";
+                }
+                
+                // make an entry with just the vendor ID
+                String pID = vID + "0000";
+                pID = pID.toUpperCase();
+                USBInfo info = new USBInfo(dvc, null);
+                devices.put(pID, info);
+
+                // parseAndLookup the later lines that have specific products
+                line = dat.nextLine();
+                if (line.startsWith("\t")) {
+                    while (dat.hasNext() && line.startsWith("\t")) {
+                        tokens = line.split("[\\t\\s]+");
+
+                        // make key based on upper case version of vendor and product IDs
+                        pID = vID + tokens[1];
+                        pID = pID.toUpperCase();
+
+                        String device = "";
+                        line = dat.nextLine();
+                        for (int n = 2; n < tokens.length; n++) {
+                            device += tokens[n] + " ";
+                        }
+
+                        info = new USBInfo(dvc, device);
+
+                        // store based on the previously generated key
+                        devices.put(pID, info);
+                    }
+                }
             }
         }
     }
 
+    /**
+     * Stores the vendor information about a USB device 
+     */
     public class USBInfo {
-
         private String vendor;
         private String product;
 
@@ -144,10 +160,18 @@ class ExtractUSB {
             product = prod;
         }
 
+        /**
+         * Get Vendor (make) information
+         * @return 
+         */
         public String getVendor() {
             return vendor;
         }
 
+        /**
+         * Get product (model) information
+         * @return 
+         */
         public String getProduct() {
             return product;
         }
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
index 5a0bc208a6..7db7b56701 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
@@ -53,7 +53,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
     private static final Logger logger = Logger.getLogger(ScalpelCarverIngestModule.class.getName());
     private final String MODULE_OUTPUT_DIR_NAME = "ScalpelCarver";
     private String moduleOutputDirPath;
-    private String configFileName = "scalpel.conf";
+    private final String configFileName = "scalpel.conf";
     private String configFilePath;
     private boolean initialized = false;
     private ScalpelCarver carver;
@@ -100,7 +100,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         // copy the default config file to the user's home directory if one
         // is not already there
         try {
-            PlatformUtil.extractResourceToUserConfigDir(this.getClass(), configFileName);
+            PlatformUtil.extractResourceToUserConfigDir(this.getClass(), configFileName, false);
         } catch (IOException ex) {
             String message = "Could not obtain the path to the Scalpel configuration file.";
             logger.log(Level.SEVERE, message, ex);
diff --git a/SevenZip/build.xml b/SevenZip/build.xml
deleted file mode 100644
index e1933d01f0..0000000000
--- a/SevenZip/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.sevenzip" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.sevenzip.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/SevenZip/manifest.mf b/SevenZip/manifest.mf
deleted file mode 100644
index 9999013410..0000000000
--- a/SevenZip/manifest.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.sevenzip/1
-OpenIDE-Module-Implementation-Version: 4
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/sevenzip/Bundle.properties
-
-
diff --git a/SevenZip/nbproject/build-impl.xml b/SevenZip/nbproject/build-impl.xml
deleted file mode 100644
index 061d48f66d..0000000000
--- a/SevenZip/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.sevenzip-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/SevenZip/nbproject/project.properties b/SevenZip/nbproject/project.properties
deleted file mode 100644
index 98d7408800..0000000000
--- a/SevenZip/nbproject/project.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
-nbm.module.author=Brian Carrier
-nbm.needs.restart=true
-spec.version.base=1.0
-
diff --git a/SevenZip/nbproject/project.xml b/SevenZip/nbproject/project.xml
deleted file mode 100644
index 2420492066..0000000000
--- a/SevenZip/nbproject/project.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.sevenzip</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.25.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/SevenZip/nbproject/suite.properties b/SevenZip/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6..0000000000
--- a/SevenZip/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/Timeline/build.xml b/Timeline/build.xml
deleted file mode 100644
index 15db18b5b7..0000000000
--- a/Timeline/build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.timeline" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.timeline.</description>
-    <import file="nbproject/build-impl.xml"/>
-    
-    <condition property="os.family.unix">
-        <os family="unix"/>
-    </condition>
-    
-    <!-- Verify that the TSK_HOME env variable is set -->
-    <target name="findTSK">
-        <property environment="env"/>
-        <condition property="tskFound">
-            <isset property="env.TSK_HOME"/>
-        </condition>
-        <fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/>
-        <echo> TSK_HOME: ${env.TSK_HOME}</echo>
-    </target>  
-    
-    <target name="getMacTime" depends="findTSK" if="os.family.unix">
-        <property environment="env"/>
-        <copy file="${env.TSK_HOME}/tools/timeline/mactime" tofile="${basedir}/release/mactime/mactime.pl"/>
-    </target>
-    
-    
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init">
-        <!-- get additional deps -->
-        <!-- This should only be done on non-Windows systems. <antcall target="getMacTime" /> -->
-    </target>
-</project>
diff --git a/Timeline/manifest.mf b/Timeline/manifest.mf
deleted file mode 100644
index 6cc867f901..0000000000
--- a/Timeline/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.timeline/1
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/timeline/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Implementation-Version: 3
-
diff --git a/Timeline/nbproject/build-impl.xml b/Timeline/nbproject/build-impl.xml
deleted file mode 100644
index 4babba24f7..0000000000
--- a/Timeline/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.timeline-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/Timeline/nbproject/project.properties b/Timeline/nbproject/project.properties
deleted file mode 100644
index 8e20c77c1a..0000000000
--- a/Timeline/nbproject/project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
-nbm.needs.restart=true
-spec.version.base=1.0.0
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
deleted file mode 100644
index 352e0fd55f..0000000000
--- a/Timeline/nbproject/project.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.timeline</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.35.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.actions</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.26.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.46.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.25.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.25.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.15.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.55.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/Timeline/nbproject/suite.properties b/Timeline/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6..0000000000
--- a/Timeline/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 3ec84adc77..54d3c9cf03 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "Autopsy"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 3
+PROJECT_NUMBER         = 3.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -672,6 +672,7 @@ INPUT                  = main.dox \
                          modAdvanced.dox \
                          platformConcepts.dox \
                          regressionTesting.dox \
+                         native_libs.dox \
                          ../../Core/src \
                          ../../CoreLibs/src \
                          ../../ExifParser/src \
@@ -893,7 +894,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = api-docs
+HTML_OUTPUT            = api-docs/3.1
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
diff --git a/docs/doxygen/modAdvanced.dox b/docs/doxygen/modAdvanced.dox
index 13fcc87319..547ba827d5 100644
--- a/docs/doxygen/modAdvanced.dox
+++ b/docs/doxygen/modAdvanced.dox
@@ -10,7 +10,7 @@ These aren't really advanced, but you don't need to know them in detail when you
 
 Some modules may have configuration settings that uses can change.  We recommend that you use the infrastructure provided by Autopsy and NetBeans to do this so that all module condiguration is done in a single place.
 
-Note: This option panel applies to all module types.  Ingest modules have a second type of option panel that can be accessed when a data source is added to a case.   Refer to \ref ingestmodule_making_configuration for details on how to use those option panels. 
+Note: This option panel applies to all module types.  Ingest modules have a second type of option panel that can be accessed when a data source is added to a case.   Refer to \ref ingest_modules_making_options for details on how to use those option panels. 
 
 To add a panel to the options menu, right click the module and choose New > Other. Under the Module Development category, select Options Panel and press Next.
 
diff --git a/docs/doxygen/modDev.dox b/docs/doxygen/modDev.dox
index 840ff123e3..337093b3df 100644
--- a/docs/doxygen/modDev.dox
+++ b/docs/doxygen/modDev.dox
@@ -40,7 +40,7 @@ The Autopsy modules are encapsulated inside of NetBeans modules. A NetBeans modu
 
 \subsection mod_dev_mod_nb Creating a NetBeans Module
 
-If this is your first module, then  you will need to make a NetBeans module. If you have already made an Autopsy module and are now working on a second one, you can consider adding it to your pevious NetBeans module. 
+If this is your first module, then  you will need to make a NetBeans module. If you have already made an Autopsy module and are now working on a second one, you can consider adding it to your previous NetBeans module. 
 
 To make a NetBeans module:
 - Open the NetBeans IDE and go to File -> New Project.
@@ -52,12 +52,14 @@ To make a NetBeans module:
 
 After the module is created, you will need to do some further configuration. 
 - Right click on the newly created module and choose "Properties".
-- You will need to configure the module to be dependent on modules from within the Autopsy platform. Go to the "Libraries" area and choose "Add" in the "Module Dependencies" section.  Choose the "Autopsy-core" library. You now have access to the Autopsy services.
+- You will need to configure the module to be dependent on modules from within the Autopsy platform. Go to the "Libraries" area and choose "Add" in the "Module Dependencies" section.  Choose the:
+-- "Autopsy-core" library to get access to the Autopsy services.
+-- "NetBeans Lookup" library so that your module can be discovered by Autopsy. 
 - If you later determine that you need to pull in external JAR files, then you will use the "Wrapped Jar" section to add them in.  
 - Note, you will also need to come back to this section if you update the platform.  You may need to add a new dependency for the version of the Autopsy-core that comes with the updated platform. 
 - Autopsy requires that all modules restart Autopsy after they are installed. Configure your module this way under Build -> Packaging.  Check the box that says Needs Restart on Install.
 
-You now have a NetBeans module that is using Autopsy as its build platform.  That means you will have access to all of the services and utilities that Autopsy provides (such as \ref platform_details). 
+You now have a NetBeans module that is using Autopsy as its build platform.  That means you will have access to all of the services and utilities that Autopsy provides (such as \ref services_page). 
 
 
 \subsubsection mod_dev_mod_config_other Optional Settings
diff --git a/docs/doxygen/modIngest.dox b/docs/doxygen/modIngest.dox
index 2512a96c37..347d9c9a5a 100644
--- a/docs/doxygen/modIngest.dox
+++ b/docs/doxygen/modIngest.dox
@@ -1,265 +1,420 @@
 /*! \page mod_ingest_page Developing Ingest Modules
 
 
-\section ingestmodule_modules Ingest Module Basics
+\section ingest_modules_getting_started Getting Started
 
-This section tells you how to make an Ingest Module.  Ingest modules
-analyze data from a data source (a disk image or set of logical
-files).  They typically focus on a specific type of data analysis.
-The modules are loaded each time that Autopsy starts.  The user can
-choose to enable each module when they add an image to the case.
-It assumes you have already setup your development environment as
-described in \ref mod_dev_page.
+This page describes how to develop ingest modules.  It assumes you have 
+already set up your development environment as described in \ref mod_dev_page.
+  
+Ingest modules analyze data from a data source (e.g., a disk image or a folder 
+of logical files). There are two types of ingest modules in Autopsy: 
 
-First, you need to choose the type of Ingest Module. 
+- Data-source-level ingest modules
+- File-level ingest modules
 
-- Data Source-level modules are passed in a reference to a top-level data source, such as an Image or folder of logical files. 
-These modules may query the database for a small set of specific files. For example, a Windows registry module that runs on the hive files.  It is interested in only a small subset of the hard drive files. 
+The difference between these two types of modules is that data-source-level modules are called once and passed in a reference to a data source to analyze and file-level ingest modules are called for each file and passed in the file to analyze. Here are some guidelines for choosing the type of your ingest module:
 
-- File-level modules are passed in a reference to each file.  
-The Ingest Manager chooses which files to pass and when.  
-These modules are intended to analyze most of the files on the system 
-For example, a hash calculation module that reads in the content of every file. 
+- Your module should be a data-source-level ingest module if it only needs to 
+retrieve and analyze a small subset of the files present in a data source and it can find those files based on data in the database (such as file names).  
+For example, a Windows registry analysis module that only processes 
+registry hive files should be implemented as a data-source-level ingest module because there are only a few registry hives and we can find them by name. 
+- Your module should be a file-level ingest module if it analyzes most or all of 
+the files from a data source, one file at a time. If you cannot rely on finding a file based on its name, it will need to be a file-level ingest module. For example, a hash look up 
+module might process every file system file by looking up its hash in one or 
+more known file and known bad files hash sets (hash databases). 
+
+As you will learn a little later in this guide, it is possible to package a 
+data-source-level ingest module and a file-level ingest module together. You
+would do this when you need to work at both levels to get all of your analysis
+done. The modules in such a pair will be enabled or disabled together and will 
+have common per ingest job and global settings. 
+
+The text below will refer to example code in the org.sleuthkit.autopsy.ingest.examples package.
+The sample modules don't do anything 
+particularly useful, but they can serve as templates for developing your own 
+ingest modules.  
 
 
 
-Refer to org.sleuthkit.autopsy.ingest.example for sample source code of dummy modules. 
 
-\section ingest_common Commonalities
+\section ingest_modules_lifecycle Ingest Module Life Cycle
 
-There are several things about these module types that are common and we'll outline those here.  For both modules, you will extend an interface and implement some methods.
+Before we dive into the details of creating a module, it is important to understand the life cycle of the module. Note that this life cycle is much different for Autopsy 3.1 modules than it was for Autopsy 3.0. This section only talks about 3.1 modules. 
 
-Refer to the documentation for each method for its use. 
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.init() is invoked when an ingest session starts. 
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.complete() is invoked when an ingest session completes.  
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.stop() is invoked on a module when an ingest session is interrupted by the user or system.
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.getName() returns the name of the module.
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.getDescription() returns a short description of the module.
-- org.sleuthkit.autopsy.ingest.IngestModuleAbstract.getVersion() returns the version of the module. 
+You will need to implement at least 2 interfaces to make an ingest module:
+-# A factory class that will be created when Autopsy starts and will provide configuration panels to Autopsy and create instances of the ingest modules.
+-# An ingest module class that will be instantiated by the factory when the ingest modules are run.  A new instance of this will be created for each thread. 
+
+Here is an example sequence of events.  Details will be provided below. 
+-# User launches Autopsy and it looks for classes that implement the org.sleuthkit.autopsy.ingest.IngestModuleFactory interface.  
+-# Autopsy finds and creates an instance of your FooIngestModuleFactory class.
+-# User adds a disk image.
+-# Autopsy presents the list of available ingest modules to the user and uses the utility methods from FooIngestModuleFactory class to get the module's name, description, and configuration panels. 
+-# User enables your module (and others).
+-# Autopsy uses FooIngestModuleFactory to create two instances of FooIngestModule (Autopsy is using two threads to process the files).
+-# Autopsy starts up the module, calls its process method, and shuts it down when all of the data is analyzed. 
+  
 
 
-The process() method is invoked to analyze the data. This is where
-the analysis is done. The specific method depends on the module
-type; it is passed either a data source or a file to process.  We'll
-cover this in later sections.  This method will post results to the
-blackboard and with inbox messages to the user.
+\section ingest_modules_implementing_ingestmodulefactory_basic Creating a Basic Ingest Module
+
+\subsection ingest_modules_implementing_basic_factory Basic Ingest Module Factory
+
+The first step to write an ingest module is to make its factory.  There are three general types of things that a factory does:
+-# Provides  basic information such as the module's name, version, and description. (required)
+-# Creates ingest modules. (required) 
+-# Provides panels so that the user can configure the module. (optional)
+
+This section covers the required parts of a basic factory so that we can make the ingest module.  A later section (\ref ingest_modules_making_options)
+covers how you can use the factory to provide options to the user. 
+
+To make writing a simple factory easier, Autopsy provides an adapter class that implements the "optional" methods in the interface. 
+Our basic factory will use the adapter. 
+
+-# Create a class either manually or using the NetBeans wizards. Edit the class to extend org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter. NetBeans will likely complain that you have not implemented the necessary methods and you can use its "hints" to automatically generate stubs for them. 
+-# Use the documentation for the org.sleuthkit.autopsy.ingest.IngestModuleFactory interface for details on what each method needs to do. You can also refer to org.sleuthkit.autopsy.examples.SampleIngestModuleFactory as an example.  
+-# Add NetBeans annotations so that the module is found at run time: 
+\code
+@ServiceProvider(service = IngestModuleFactory.class)
+\endcode
+
+You will also need to import org.openide.util.lookup.ServiceProvider and add a dependency on the NetBeans Lookup 
+API module to the NetBeans module that contains your ingest module.
+
+At this point, you should be able to compile your NetBeans module and run it. When you add a data source, 
+you should see the module in the list of ingest modules.  If you don't see it, double check that you extend 
+correct class and added the service provider annotation. 
 
 
-\section ingest_datasrc Data Source-level Modules
 
-To make a data source-level module, make a new Java class either manually or using the NetBeans wizards. Edit the class to extend "org.sleuthkit.autopsy.ingest.IngestModuleDataSource". NetBeans will likely complain that you have not implemented the necessary methods and you can use its "hints" to automatically generate stubs for them. Use the documentation for the org.sleuthkit.autopsy.ingest.IngestModuleDataSource class for details on what each needs to do. 
-You can also refer to org.sleuthkit.autopsy.examples.SampleDataSourceIngestModule as an example module. 
+\subsection ingest_modules_implementing_ingestmodule Understanding the IngestModule Interface
+
+Data source and file ingest modules have similar APIs. The main difference is what data gets passed 
+to the methods.  Let's first cover the common concepts. 
+
+Both modules implement the org.sleuthkit.autopsy.ingest.IngestModule interface, which defines two methods to allocate and free resources:
+- org.sleuthkit.autopsy.ingest.IngestModule.startUp() 
+- org.sleuthkit.autopsy.ingest.IngestModule.shutDown()
+
+Use the previous links to get the details of each method. The ingest modules will also have to implement a process()
+method that will get passed in either a DataSource or a File.  
+
+This section outlines the basic idea of modules and the org.sleuthkit.autopsy.ingest.IngestModule documentation should
+be referred to for more details. 
+
+- startUp() will be called before any data is analyzed to initialize and allocate resources, process() will then be called with data to analyze, and then shutDown() will be called to free resources and send ingest messages (see \ref ingest_modules_making_results). 
+- Any setup procedures that could fail should be done in startUp() so that it can throw an exception and cause the ingest job to stop and notify the user. 
+- startUp(), process(), and shutDown() will be called from a single thread.  So, basic modules do not need to worry about thread safety if they allocate resources for each instance of the module. If the module wants to share resources between instances, then it is responsible for  synchronizing the the shared resource.  See org.sleuthkit.autopsy.examples.SampleFileIngestModule as an example that shares resources. 
 
 
-Data source-level ingest modules must find the files that they want to analyze.  The best way to do that is using one of the findFiles() methods in org.sleuthkit.autopsy.casemodule.services.FileManager.   See \ref mod_dev_other_services for more details. 
+The org.sleuthkit.autopsy.ingest.DataSourceIngestModule and org.sleuthkit.autopsy.ingest.FileIngestModule
+interfaces both extend org.sleuthkit.autopsy.ingest.IngestModule. 
+For your convenience, an ingest module that does not require 
+initialization and/or clean up may extend the abstract 
+org.sleuthkit.autopsy.ingest.IngestModuleAdapter class to get default 
+"do nothing" implementations of these methods.
 
-Example snippet of an ingest-level module process() method:
+\subsection ingest_modules_implementing_datasourceingestmodule Creating a Data Source Ingest Module
+
+To create a data source ingest module:
+-# Make a new Java class either manually or 
+using the NetBeans wizards. 
+-# Make the class implement 
+org.sleuthkit.autopsy.ingest.DataSourceIngestModule and optionally make it 
+extend org.sleuthkit.autopsy.ingest.IngestModuleAdapter.  
+-# The NetBeans IDE 
+will complain that you have not implemented one or more of the required methods.
+You can use its "hints" to automatically generate stubs for the missing methods.  Use this page and the 
+documentation for the org.sleuthkit.autopsy.ingest.IngestModule and 
+org.sleuthkit.autopsy.ingest.DataSourceIngestModule interfaces for guidance on 
+what each method needs to do.  Or you can copy the code from  
+org.sleuthkit.autopsy.examples.SampleDataSourceIngestModule and use it as a 
+template for your module.  
+
+All data source ingest modules must implement the single method defined by the 
+org.sleuthkit.autopsy.ingest.DataSourceIngestModule interface:
+
+- org.sleuthkit.autopsy.ingest.DataSourceIngestModule.process()
+
+The process() method is where all of the work of a data source ingest module is
+done. It will be called exactly once between startUp() and shutDown(). The 
+process() method receives a reference to an org.sleuthkit.datamodel.Content object
+and an org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper object.
+The former is a representation of the data source. The latter should be used
+by the module instance to be a good citizen within Autopsy as it does its 
+potentially long-running processing.
+
+
+Note that data source ingest modules must find the files that they want to analyze.  
+The best way to do that is using one of the findFiles() methods of the  
+org.sleuthkit.autopsy.casemodule.services.FileManager class.  See 
+\ref mod_dev_other_services for more details. 
+
+The final step to getting the basic ingest module working is to configure your factory class to create instances of it. To do this, you will need to change the isDataSourceIngestModuleFactory() method to return true and have the createDataSourceIngestModule() method return a new instance of your ingest module. Both of these methods have default implementations in the IngestModuleFactoryAdapter that we used.  Your factory should have code similar to:
 
 \code
-@Override
-public void process(Content dataSource, IngestDataSourceWorkerController controller) {
-        
-    //we have some number workunits / sub-tasks to execute
-    //in this case, we know the number of total tasks in advance
-    final int totalTasks = 12;
+    @Override
+    public boolean isDataSourceIngestModuleFactory() {
+        return true;
+    }
 
-    //initialize the overall image ingest progress
-    controller.switchToDeterminate();
-    controller.progress(totalTasks);
-       
-    for(int subTask = 0; subTask < totalTasks; ++subTask) {
-        //add cancellation support
-        if (controller.isCancelled() ) {
-            break; // break out early to let the thread terminate
-        }
-
-         //do the work
-        try {
-            //sub-task may add blackboard artifacts and create an inbox message
-            performSubTask(i);
-        } catch (Exception ex) {
-            logger.log(Level.WARNING, "Exception occurred in subtask " + subTask, ex);
-        }
-
-        //update progress
-        controller.progress(i+1);
-    }   
-}
+    @Override
+    public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) {
+        return new FooDataSourceIngestModule();  // replace this class name with the name of your class
+    }
 \endcode
 
 
-\section ingest_file File-level Modules
+\subsection ingest_modules_implementing_fileingestmodule Creating a File Ingest Module
 
-To make a File-level module, make a new Java class either manually or using the NetBeans wizards. Edit the class to extend "org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile". NetBeans will likely complain that you have not implemented the necessary methods and you can use its "hints" to automatically generate stubs for them. Use the method documentation in the org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile class to fill in the details.
-You can also refer to org.sleuthkit.autopsy.examples.SampleFileIngestModule as an example module. 
+To create a file ingest module:
+-# Make a new Java class either manually or 
+using the NetBeans wizards. 
+-# Make the class implement 
+org.sleuthkit.autopsy.ingest.FileIngestModule and optionally make it 
+extend org.sleuthkit.autopsy.ingest.IngestModuleAdapter.  
+-# The NetBeans IDE 
+will complain that you have not implemented one or more of the required methods. 
+You can use its "hints" to automatically generate stubs for the missing methods.  Use this page and the 
+documentation for the org.sleuthkit.autopsy.ingest.IngestModule and 
+org.sleuthkit.autopsy.ingest.FileIngestModule interfaces for guidance on what 
+each method needs to do.  Or you can copy the code from  
+org.sleuthkit.autopsy.examples.SampleFileIngestModule and use it as a 
+template for your module.  
 
-Unlike Data Source-level modules, file-level modules are singletons.  Only a single instance is created for all files. 
-The same file-level module instance will be used for files in different images and even different cases if new cases are opened. 
+All file ingest modules must implement the single method defined by the 
+org.sleuthkit.autopsy.ingest.FileIngestModule interface:
 
-Every file-level module should support multiple init() -> process() -> complete(), and init() -> process() -> stop() invocations.  It should also support init() -> complete() sequences.  A new case could be open for each call of init().
+- org.sleuthkit.autopsy.ingest.FileIngestModule.process()
 
-Currently (and this is likely to change in the future), File-level ingest modules are Singletons (meaning that only a single instance is created for the runtime of Autopsy).  
-You will need to implement a public static getDefault() method that returns a static instance of the module.  Note that if you skip this step, you will not see an error until Autopsy tries to load your module and the log will say that it does not have a getDefault method. 
+The process() method is where all of the work of a file ingest module is
+done. It will be called repeatedly between startUp() and shutDown(), once for 
+each file Autopsy feeds into the pipeline of which the module instance is a part. The 
+process() method receives a reference to a org.sleuthkit.datamodel.AbstractFile 
+object. 
 
-The implementation of this method is very standard, example:
+The final step to getting the basic ingest module working is to configure your factory class to create instances of it. To do this, you will need to change the isFileIngestModuleFactory() method to return true and have the createFileIngestModule() method return a new instance of your ingest module. Both of these methods have default implementations in the IngestModuleFactoryAdapter that we used.  Your factory should have code similar to:
 
 \code
-public static synchronized MyIngestModule getDefault() {
+    @Override
+    public boolean isFileIngestModuleFactory() {
+        return true;
+    }
 
-   //defaultInstance is a private static class variable
-   if (defaultInstance == null) {
-        defaultInstance = new MyIngestModule();
-   }
-   return defaultInstance;
-}
+    @Override
+    public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) {
+        return new FooFileIngestModule(); // replace this class name with the name of your class
+    }
 \endcode
 
 
-You should also make the constructor private to ensure the singleton status. 
+\section ingest_modules_services Platform Services
 
-As a result of the singleton design, init() will be called multiple times and even for different cases.  Ensure that you update local member variables accordingly each time init() is called.  Again, this design will likely change, but it is what it is for now.
+The previous section will allow you to get a module up and running that will be passed in either a file or a data source to analyze. 
+This section covers how you get access to more data and how you can display data to the user. 
 
 
-\section ingestmodule_registration Module Registration
+\subsection ingest_modules_services_ingest Ingest Services
 
-Modules are automatically discovered if they implement the proper interface. 
-Currently, a restart of Autopsy is required after a module is installed before it is discovered.
+The singleton instance of the org.sleuthkit.autopsy.ingest.IngestServices class 
+provides services tailored to the needs of ingest modules, and a module developer 
+should use these utilities to log errors, send messages, get the current case, 
+fire events, persist simple global settings, etc.  Refer to the documentation 
+of the IngestServices class for method details. 
 
-By default, modules that do not come with a standard Autopsy installation will run after the standard modules. No order
-is implied. This design will likely change in the future, but currently manual configuration is needed to enforce order.
+\subsection ingest_modules_making_results Giving the User Feedback
+
+Ingest modules run in the background.  There are three ways to send messages and 
+save results so that the user can see them:
+
+- Use the blackboard for long-term storage of analysis results. These results
+will be displayed in the results tree.
+- Use the ingest messages inbox to notify users of high-value analysis results 
+that were also posted to the blackboard.
+- Use the logging and/or message box utilities for error messages.
 
 
-There is an XML pipeline configuration that contains the standard modules and specifies the order that they are run in. 
-If you need to specify the order of modules, then they needed to be manually addded to this file in the correct order. 
-This file is the same format as The Sleuth Kit Framework configuration file. 
-Refer to http://sleuthkit.org/sleuthkit/docs/framework-docs/pipeline_config_page.html which is an official documentation 
-for the pipeline configuration schema.
+\subsection ingest_modules_making_results_bb Posting Results to the Blackboard
+The blackboard is used to store results so that they are displayed in the results tree.  
+See \ref platform_blackboard  for details on posting results to it. 
 
-Autopsy will provide tools for reconfiguring the ingest pipeline in the near future, 
-and user/developer will be able to reload current view of discovered modules, 
-reorder modules in the pipeline and set their arguments using GUI.
+The blackboard defines artifacts for specific data types (such as web bookmarks). 
+You can use one of the standard artifact types, create your own, or simply post text 
+as a org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT artifact.
+The latter is much easier (for example, you can simply copy in the output from 
+an existing tool), but it forces the user to parse the output themselves.  
 
-
-\section ingestmodule_services Ingest Services
-
-Class org.sleuthkit.autopsy.ingest.IngestServices provides services specifically for the ingest modules
-and a module developer should use these utilities to send messages, get current case, etc.  Refer to its documentation for method details. 
-
-Remember, update references to IngestServices and Cases with each call to init() inside of the module. 
-
-Module developers are encouraged to use Autopsy's org.sleuthkit.autopsy.coreutils.Logger 
-infrastructure to log errors to the Autopsy log.  
-The logger can also be accessed using the org.sleuthkit.autopsy.ingest.IngestServices class.
-
-Certain modules may need need a persistant store (other than for storing results) for storing and reading
-module configurations or state.  
-The ModuleSettings API can be used also via org.sleuthkit.autopsy.ingest.IngestServices class.
-
-
-\section ingestmodule_making_results Making Results Available to User
-
-Ingest modules run in the background.  There are three ways to send messages and save results so that the user can see them:
-- Blackboard for long-term storage of analysis results and to display in the results tree.
-- Ingest Inbox to notify user of high-value analysis results that were also posted to blackboard.
-- Error messages.
-
-\subsection ingestmodule_making_results_bb Posting Results to Blackboard
-The blackboard is used to store results so that they are displayed in the results tree.  See \ref platform_blackboard  for details on posting results to it. 
-
-The blackboard defines artifacts for specific data types (such as web bookmarks). You can use one of the standard artifact types, create your own, or simply post text with a org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_TOOL_OUTPUT. The later is much easier (for example, you can simply copy in the output from an existing tool), but it forces the user to parse the output themselves.  
-
-When modules add data to the blackboard, 
-they should notify listeners of the new data by 
-invoking IngestServices.fireModuleDataEvent() method. 
+When modules add data to the blackboard, they should notify listeners of the new 
+data by invoking the org.sleuthkit.autopsy.ingest.IngestServices.fireModuleDataEvent() method. 
 Do so as soon as you have added an artifact to the blackboard.
-This allows other modules (and the main UI) to know when to query the blackboard for the latest data. 
-However, if you are writing a larger number of blackboard artifacts in a loop, it is better to invoke
-IngestServices.fireModuleDataEvent() only once after the bulk write, not to flood the system with events.
+This allows other modules (and the main UI) to know when to query the blackboard 
+for the latest data.  However, if you are writing a large number of blackboard 
+artifacts in a loop, it is better to invoke org.sleuthkit.autopsy.ingest.IngestServices.fireModuleDataEvent() 
+only once after the bulk write, so as not to flood the system with events.
 
 
-\subsection ingestmodule_making_results_inbox Posting Results to Message Inbox
+\subsection ingest_modules_making_results_inbox Posting Results to the Message Inbox
 
-Modules should post messages to the inbox when interesting data is found
-that has also been posted to the blackboard.  The idea behind these
-messages are that they are presented in chronological order so that
+Modules should post messages to the inbox when interesting data is found. 
+Of course, such data should also be posted to the blackboard as described above.  The idea behind 
+the ingest messages is that they are presented in chronological order so that
 users can see what was found while they were focusing on something else.
-Error messages are also sent here as is summary information after the module has run to give the user some feedback. 
+
+Inbox messages should only be sent if the result has a low false positive rate 
+and will likely be relevant.  For example, the core Autopsy hash lookup module 
+sends messages if known bad (notable) files are found, but not if known good 
+(NSRL) files are found. This module also provides a global setting 
+(using its global settings panel) that allows a user to turn these messages on 
+or off. 
+
+Messages are created using the org.sleuthkit.autopsy.ingest.IngestMessage class 
+and posted to the inbox using the org.sleuthkit.autopsy.ingest.IngestServices.postMessage() 
+method. 
 
 
-These messages should only be sent if the result has a low false positive rate and will likely be relevant.  
-For example, the hash lookup module will send messages if known bad (notable) files are found, 
-but not if known good (NSRL) files are found.  You can provide options to the users on when to make messages. 
+\subsection ingest_modules_making_results_error Reporting Errors
 
-
-A single message includes the module name, message subject, message details, 
-a unique message id (in the context of the originating module), and a uniqueness attribute.  
-The uniqueness attribute is used to group similar messages together 
-and to determine the overall importance priority of the message 
-(if the same message is seen repeatedly, it is considered lower priority).
-
-For example, for a keyword search module, the uniqueness attribute would the keyword that was hit.
-
-Messages are created using the org.sleuthkit.autopsy.ingest.IngestMessage class and posted to the inbox using org.sleuthkit.autopsy.ingest.IngestServices.postMessage() method. 
-
-
-\subsection ingestmodule_making_results_error Reporting Errors
-
-When an error occurs, you should send a message to the ingest inbox with an error level.  The downside of this though is that the ingest inbox was not entirely designed for this goal and it is easy for the user to miss these messages.  Therefore, we identify these messages in the IngestInbox and also post a pop-up message that comes up in the lower right. 
-
-You can make your own message in the lower right by using 
-org.sleuthkit.autopsy.coreutils.MessageNotifyUtil.Notify.show()
+When an error occurs, you should write an error message to the Autopsy logs, using a 
+logger obtained from org.sleuthkit.autopsy.ingest.IngestServices.getLogger().
+You could also send an error message to the ingest inbox. The 
+downside of this is that the ingest inbox was not really designed for this 
+purpose and it is easy for the user to miss these messages.  Therefore, it is 
+preferable to post a pop-up message that is displayed in the lower right hand
+corner of the main window by calling 
+org.sleuthkit.autopsy.coreutils.MessageNotifyUtil.Notify.show().
 
 
 
-\section ingestmodule_making_configuration Module Configuration
-
-Ingest modules may require user configuration. In \ref mod_dev_adv_options, you wll learn about Autopsy-wide settings.  There are some
-settings that are specific to ingest modules as well. 
-
-The framework 
-supports two levels of configuration: simple and advanced. Simple settings enable the user to enable and disable basic things at run-time (using check boxes and such).
-Advanced settings require more in-depth configuration with more powerful interface. 
-
-As an example, the advanced configuration for the keyword search module allows you to add and create keyword lists, choose encodings, etc. The simple interface allows
-you to enable and disable lists. 
-
-Module configuration is module-specific: every module maintains its own configuration state and is responsible for implementing the graphical interface. 
-If a module needs simple or advanced configuration, it needs to implement methods in its interface. 
-The org.sleuthkit.autopsy.ingest.IngestModuleAbstract.hasSimpleConfiguration(),
-org.sleuthkit.autopsy.ingest.IngestModuleAbstract.getSimpleConfiguration(), and org.sleuthkit.autopsy.ingest.IngestModuleAbstract.saveSimpleConfiguration()
-methods should be used for simple configuration.  This panel will be shown when the user chooses which ingest modules to enable. 
-
-The advanced configuration is implemented with the 
-org.sleuthkit.autopsy.ingest.IngestModuleAbstract.hasAdvancedConfiguration(),
-org.sleuthkit.autopsy.ingest.IngestModuleAbstract.getAdvancedConfiguration(), and 
-org.sleuthkit.autopsy.ingest.IngestModuleAbstract.saveAdvancedConfiguration()
-methods. This panel can be accessed from the "Advanced" button when the user chooses which ingest modules to enable. 
-It is recommended that the advanced panel be the same panel that is used in the Options area (see  \ref mod_dev_adv_options).
-
-Refer to \ref mod_dev_adv_properties for details on saving properties from these panels. 
 
 
-<!-- @@@  MOVE THIS TO ADVANED -- I"M NOT SURE WHO NEEDS THIS..
-\section ingestmodule_events Getting Ingest Status and Events
+\section ingest_modules_making_options User Options
 
-NOTE: Sync this up with \ref mod_dev_events.
+Autopsy allows a module to provide two levels of configuration:
+- When an ingest job is being configured, the user can choose settings that are unique to that ingest job / pipeline.  For example. to enable a certain hash set.
+- The user can configure global settings that apply to all jobs. For example, to add or delete a hash set.
 
-Other modules and core Autopsy classes may want to get the overall ingest status from the ingest manager.  
-The IngestManager handle is obtained using org.sleuthkit.autopsy.ingest.IngestManager.getDefault().
-The manager provides access to ingest status with the 
-org.sleuthkit.autopsy.ingest.IngestManager.isIngestRunning() method and related methods 
-that allow to query ingest status per specific module.
+To provide either or both of these options to the user, we need to implement methods defined in the IngestModuleFactory interface.  You can either add them to your class that extends the IngestModuleFactoryAdapter or decide to simply implement the interface.
 
-External modules (such as data viewers) can also register themselves as ingest module event listeners 
-and receive event notifications (when a module is started, stopped, completed or has new data).  
-Use the IngestManager.addPropertyChangeListener() method to register a module event listener.  
-Events types received are defined in IngestManager.IngestModuleEvent enum.   
+You can also refer to sample implementations of the interfaces and abstract 
+classes in the org.sleuthkit.autopsy.examples package, although you should note 
+that the samples do not do anything particularly useful. 
 
-At the end of the ingest, IngestManager itself will notify all listeners of IngestModuleEvent.COMPLETED event.
-The event is an indication for listeners to perform the final data refresh by quering the blackboard.
-Module developers are encouraged to generate periodic IngestModuleEvent.DATA 
-ModuleDataEvent events when they post data to the blackboard, 
-but the IngestManager will make a final event to handle scenarios where the module did not notify listeners while it was running. 
--->
+
+\subsection ingest_modules_making_options_ingest Ingest Job Options
+
+To provide options for each ingest job:
+- hasIngestJobSettingsPanel() must return true
+- getIngestJobSettingsPanel() must return a IngestModuleIngestJobSettingsPanel that displays the needed configuration options and returns a IngestModuleIngestJobSettings object based on the settings.
+- You are free to implement IngestModuleIngestJobSettings and store whatever you want in it (as long as it is serializable)
+- The IngestModuleIngestJobSettings object that was created during configuration will be passed back to the factory with each call to createDataSourceIngestModule() or createFileIngestModule().  The factory should cast it to its internal class that implements IngestModuleIngestJobSettings and pass that object into the constructor of its ingest module so that it can use the settings when it runs. 
+
+
+You can also implement the getDefaultIngestJobSettings() method to return the default settings that Autopsy should use when the module has not been run before. 
+
+NOTE: We recommend storing simple data in the IngestModuleIngestJobSettings-based class.  In the case of our hash lookup module, we store the string names of the hash databases to lookup in.  We then get the hash database handles in the call to startUp() using the global module settings. 
+
+
+\subsection ingest_modules_making_options_global Global Options
+
+To provide global options: 
+- hasGlobalSettingsPanel() must return true
+- getGlobalSettingsPanel() must return a org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel with widgets to support the global settings. 
+- You are responsible for persisting global settings and may use the module 
+settings methods provided by org.sleuthkit.autopsy.ingest.IngestServices for 
+saving simple properties, or the facilities of classes such as 
+org.sleuthkit.autopsy.coreutils.PlatformUtil and org.sleuthkit.autopsy.coreutils.XMLUtil 
+for more sophisticated approaches.
+- You are responsible for providing a way for the ingest module to obtain the global settings. For 
+example, the Autopsy core hash look up module comes with a singleton hash databases
+manager. Users import and create hash databases using the global settings panel.
+Then they select which hash databases to use for a particular job using the 
+ingest job settings panel. When a module instance runs, it gets the relevant
+databases from the hash databases manager. 
+- You are responsible for having the ingest job options panel update itself if the global settings change (i.e. if a new item is added that must be listed on the ingest panel). 
+
+
+
+
+\section ingest_modules_pipeline_configuration Controlling the Ordering of Ingest Modules in Ingest Pipelines
+
+By default, ingest modules that are not part of the standard Autopsy 
+installation will run after the core ingest modules. No order is implied. This 
+will likely change in the future, but currently manual configuration is needed 
+to enforce sequencing of ingest modules.
+
+There is an ingest pipeline configuration XML file that specifies the order for
+running the core ingest modules. If you need to insert your ingest modules in
+the sequence of core modules or control the ordering of non-core modules, you 
+must edit this file by hand. You will find it in the config directory of your
+Autopsy installation, typically something like "C:\Users\yourUserName\AppData\Roaming\.autopsy\dev\config\pipeline_config.xml"
+on a Microsoft Windows platform.  Check the Userdir listed in the Autopsy About 
+dialog.
+
+Autopsy will provide tools for reconfiguring the ingest pipeline in the near 
+future. Until that time, there is no guarantee that the schema of this file will
+remain fixed and that it will not be overwritten when upgrading your Autopsy
+installation.
+
+\section ingest_modules_api_migration Migrating Ingest Modules to the Current API
+
+This section is a guide for module developers who wrote modules for the 3.0 API.  These API changes occurred so that 
+we could make parallel pipelines of the file-level ingest modules.   This section assumes you've read the above description of the new API.
+
+There are three big changes to make in your module:
+-# Modules are no longer singletons. Autopsy will make one of your factory classes and many instances of the ingest modules.  As part of the migration to the new classes, your singleton infrastructure will disappear. 
+-# You'll need to move the UI/Configuration methods into the factory class and the ingest module methods into their own class.  You'll also need to update the APIs for the methods a bit.
+-# You'll need to review your ingest module code for thread safety if you are using any static member variables. 
+
+
+We recommend that you:
+-# Create a new factory class and move over the UI panels, configuration code, and standard methods (name, description, version, etc.).
+-- You'll probably want the name in the ingest module code, so you should also store the name in a package-wide member variable.
+-# Get the factory to compile and work. You can do basic testing by running Autopsy and verifying that you see your module and its panels. 
+-# Change your old ingest module to implement the new interface and adjust it (see the name changes below). Then update the factory to create it. 
+-# Review the ingest module code for thread safety (especially look for static member variables)
+
+
+The following tables provide a mapping of the methods of the old abstract classes to 
+the new interfaces:
+
+Old method | New Method |
+---------- | ---------- |
+IngestModuleAbstract.getType() | N/A |
+IngestModuleAbstract.init() | IngestModule.startUp() |
+IngestModuleAbstract.getName() | IngestModuleFactory.getModuleName() |
+IngestModuleAbstract.getDescription() | IngestModuleFactory.getModuleDescription() |
+IngestModuleAbstract.getVersion() | IngestModuleFactory.getModuleVersion() |
+IngestModuleAbstract.hasBackgroundJobsRunning | N/A |
+IngestModuleAbstract.complete() | IngestModule.shutDown() |
+IngestModuleAbstract.hasAdvancedConfiguration() | IngestModuleFactory.hasGlobalSettingsPanel() |
+IngestModuleAbstract.getAdvancedConfiguration() | IngestModuleFactory.getGlobalSettingsPanel() |
+IngestModuleAbstract.saveAdvancedConfiguration() | IngestModuleGlobalSetttingsPanel.saveSettings() |
+N/A | IngestModuleFactory.getDefaultIngestJobSettings() |
+IngestModuleAbstract.hasSimpleConfiguration() | IngestModuleFactory.hasIngestJobSettingsPanel() |
+IngestModuleAbstract.getSimpleConfiguration() | IngestModuleFactory.getIngestJobSettingsPanel() |
+IngestModuleAbstract.saveSimpleConfiguration() | N/A |
+N/A | IngestModuleIngestJobSettingsPanel.getSettings()  |
+N/A | IngestModuleFactory.isDataSourceIngestModuleFactory() |
+N/A | IngestModuleFactory.createDataSourceIngestModule() |
+N/A | IngestModuleFactory.isFileIngestModuleFactory() |
+N/A | IngestModuleFactory.createFileIngestModule() |
+
+Notes:
+- IngestModuleFactory.getModuleName() should delegate to a static class method 
+that can also be called by ingest module instances.
+- Autopsy passes a flag to IngestModule.shutDown() indicating whether the ingest 
+job completed or was cancelled.
+- The global settings panel (formerly "advanced") for a module must implement
+IngestModuleGlobalSettingsPanel which extends JPanel. Global settings are those
+that affect all modules, regardless of ingest job and pipeline.
+- The per ingest job settings panel (formerly "simple") for a module must implement
+IngestModuleIngestJobSettingsPanel which extends JPanel. It takes the settings
+for the current context as a serializable IngestModuleIngestJobSettings object
+and its getSettings() methods returns a serializable IngestModuleIngestJobSettings object.  
+The IngestModuleIngestJobSettingsPanel.getSettings() method replaces the saveSimpleSettings() method, 
+except that now Autopsy persists the settings in a context-sensitive fashion.
+- The IngestModuleFactory creation methods replace the getInstance() methods of
+the former singletons and receive a IngestModuleIngestJobSettings object that should be
+passed to the constructors of the module instances the factory creates. 
 
 */
diff --git a/docs/doxygen/services.dox b/docs/doxygen/services.dox
index 48b8039025..ae6c293d03 100644
--- a/docs/doxygen/services.dox
+++ b/docs/doxygen/services.dox
@@ -24,7 +24,7 @@ The followig are basic services that are available.
 - FileManager: the org.sleuthkit.autopsy.casemodule.services.FileManager service provides an API to access any file in the case. You can access FileManager by calling org.sleuthkit.autopsy.casemodule.services.Services.getFileManager().  Data Source-level Ingest modules and Report modules typically use this service because the other modules are passed in a reference to a specific file to do something with. 
 - org.sleuthkit.autopsy.coreutils.Logger - Use this class to log error and informational messages to the central Autopsy log file.
 - If you have a background task that needs the provide the user with feedback, you can use the org.sleuthkit.autopsy.coreutils.MessageNotifyUtil.Notify.show() method to make a message in the lower right hand area.
-- IngestModules also have a class that provides additional services.  See \ref ingestmodule_services. 
+- IngestModules also have a class that provides additional services.  See \ref ingest_modules_services_ingest. 
 
 
 \subsection mod_dev_other_utilities Framework Utilities
diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
index e0c7819377..5d039fe304 100755
--- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
+++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
@@ -24,7 +24,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.xml.bind.DatatypeConverter;
 import org.sleuthkit.autopsy.ingest.IngestModuleAdapter;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
 import org.sleuthkit.autopsy.ingest.IngestServices;
@@ -49,17 +49,18 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
     private Image img;
     private String imgName;
     private MessageDigest messageDigest;
-    private static int messageId = 0; // RJCTODO: Not thread safe
     private boolean verified = false;
     private boolean skipped = false;
     private String calculatedHash = "";
     private String storedHash = "";
+    private IngestJobContext context;
 
     EwfVerifyIngestModule() {
     }
 
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
+        this.context = context;
         verified = false;
         skipped = false;
         img = null;
@@ -80,14 +81,14 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
     }
 
     @Override
-    public ProcessResult process(Content dataSource, DataSourceIngestModuleStatusHelper statusHelper) {
+    public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) {
         imgName = dataSource.getName();
         try {
             img = dataSource.getImage();
         } catch (TskCoreException ex) {
             img = null;
             logger.log(Level.SEVERE, "Failed to get image from Content.", ex);
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
+            services.postMessage(IngestMessage.createMessage( MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "EwfVerifyIngestModule.process.errProcImg",
                     imgName)));
@@ -98,7 +99,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
         if (img.getType() != TskData.TSK_IMG_TYPE_ENUM.TSK_IMG_TYPE_EWF_EWF) {
             img = null;
             logger.log(Level.INFO, "Skipping non-ewf image {0}", imgName);
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, EwfVerifierModuleFactory.getModuleName(),
+            services.postMessage(IngestMessage.createMessage( MessageType.INFO, EwfVerifierModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "EwfVerifyIngestModule.process.skipNonEwf",
                     imgName)));
@@ -110,7 +111,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
             storedHash = img.getMd5().toLowerCase();
             logger.log(Level.INFO, "Hash value stored in {0}: {1}", new Object[]{imgName, storedHash});
         } else {
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
+            services.postMessage(IngestMessage.createMessage( MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "EwfVerifyIngestModule.process.noStoredHash",
                     imgName)));
@@ -118,7 +119,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
         }
 
         logger.log(Level.INFO, "Starting hash verification of {0}", img.getName());
-        services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, EwfVerifierModuleFactory.getModuleName(),
+        services.postMessage(IngestMessage.createMessage( MessageType.INFO, EwfVerifierModuleFactory.getModuleName(),
                 NbBundle.getMessage(this.getClass(),
                 "EwfVerifyIngestModule.process.startingImg",
                 imgName)));
@@ -126,7 +127,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
         long size = img.getSize();
         if (size == 0) {
             logger.log(Level.WARNING, "Size of image {0} was 0 when queried.", imgName);
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
+            services.postMessage(IngestMessage.createMessage( MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "EwfVerifyIngestModule.process.errGetSizeOfImg",
                     imgName)));
@@ -146,7 +147,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
 
         // Read in byte size chunks and update the hash value with the data.
         for (int i = 0; i < totalChunks; i++) {
-            if (statusHelper.isIngestJobCancelled()) {
+            if (context.isJobCancelled()) {
                 return ProcessResult.OK;
             }
             data = new byte[(int) chunkSize];
@@ -155,7 +156,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
             } catch (TskCoreException ex) {
                 String msg = NbBundle.getMessage(this.getClass(),
                         "EwfVerifyIngestModule.process.errReadImgAtChunk", imgName, i);
-                services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(), msg));
+                services.postMessage(IngestMessage.createMessage( MessageType.ERROR, EwfVerifierModuleFactory.getModuleName(), msg));
                 logger.log(Level.SEVERE, msg, ex);
                 return ProcessResult.ERROR;
             }
@@ -179,7 +180,7 @@ public class EwfVerifyIngestModule extends IngestModuleAdapter implements DataSo
             extra += "<li>Result:" + msg + "</li>";
             extra += "<li>Calculated hash: " + calculatedHash + "</li>";
             extra += "<li>Stored hash: " + storedHash + "</li>";
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, EwfVerifierModuleFactory.getModuleName(), imgName + msg, extra));
+            services.postMessage(IngestMessage.createMessage( MessageType.INFO, EwfVerifierModuleFactory.getModuleName(), imgName + msg, extra));
             logger.log(Level.INFO, "{0}{1}", new Object[]{imgName, msg});
         }
     }
diff --git a/git-daemon-export-okay b/git-daemon-export-okay
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/nbproject/project.properties b/nbproject/project.properties
index f6595e2a4f..73cc3f420b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -9,7 +9,6 @@ app.version=3.1.0_Beta
 ### Must be one of: DEVELOPMENT, RELEASE
 build.type=RELEASE
 project.org.sleuthkit.autopsy.ewfverify=ewfVerify
-project.org.sleuthkit.autopsy.fileextmismatch=FileExtMismatch
 #build.type=DEVELOPMENT
 update_versions=false
 #custom JVM options
@@ -28,15 +27,10 @@ modules=\
     ${project.org.sleuthkit.autopsy.recentactivity}:\
     ${project.org.sleuthkit.autopsy.testing}:\
     ${project.org.sleuthkit.autopsy.thunderbirdparser}:\
-    ${project.org.sleuthkit.autopsy.exifparser}:\
     ${project.org.sleuthkit.autopsy.core}:\
     ${project.org.sleuthkit.autopsy.corelibs}:\
-    ${project.org.sleuthkit.autopsy.sevenzip}:\
     ${project.org.sleuthkit.autopsy.scalpel}:\
-    ${project.org.sleuthkit.autopsy.timeline}:\
-    ${project.org.sleuthkit.autopsy.filetypeid}:\
-    ${project.org.sleuthkit.autopsy.ewfverify}:\
-    ${project.org.sleuthkit.autopsy.fileextmismatch}
+    ${project.org.sleuthkit.autopsy.ewfverify}
 project.org.sleuthkit.autopsy.core=Core
 project.org.sleuthkit.autopsy.corelibs=CoreLibs
 project.org.sleuthkit.autopsy.hashdatabase=HashDatabase
@@ -44,9 +38,5 @@ project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
 project.org.sleuthkit.autopsy.recentactivity=RecentActivity
 project.org.sleuthkit.autopsy.testing=Testing
 project.org.sleuthkit.autopsy.thunderbirdparser=thunderbirdparser
-project.org.sleuthkit.autopsy.exifparser=ExifParser
-project.org.sleuthkit.autopsy.sevenzip=SevenZip
 project.org.sleuthkit.autopsy.scalpel=ScalpelCarver
-project.org.sleuthkit.autopsy.timeline=Timeline
-project.org.sleuthkit.autopsy.filetypeid=FileTypeId
 
diff --git a/test/script/regression.py b/test/script/regression.py
index 0d09f72a22..7c33e62d33 100755
--- a/test/script/regression.py
+++ b/test/script/regression.py
@@ -34,16 +34,13 @@ import xml
 from time import localtime, strftime
 from xml.dom.minidom import parse, parseString
 import smtplib
-from email.mime.image import MIMEImage
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
 import re
 import zipfile
 import zlib
-import Emailer
 import srcupdater
 from regression_utils import *
-
+import shutil
+import ntpath
 #
 # Please read me...
 #
@@ -130,7 +127,6 @@ class TestRunner(object):
         logres =[]
         for test_data in test_data_list:
             Errors.clear_print_logs()
-            Errors.set_testing_phase(test_data.image)
             if not (test_config.args.rebuild or os.path.exists(test_data.gold_archive)):
                 msg = "Gold standard doesn't exist, skipping image:"
                 Errors.print_error(msg)
@@ -148,28 +144,16 @@ class TestRunner(object):
             time.sleep(10)
 
         Reports.write_html_foot(test_config.html_log)
-        # TODO: move this elsewhere
-        if (len(logres)>0):
-            for lm in logres:
-                for ln in lm:
-                    Errors.add_email_msg(ln)
-
         # TODO: possibly worth putting this in a sub method
         if all([ test_data.overall_passed for test_data in test_data_list ]):
-            Errors.add_email_msg("All images passed.\n")
+            pass 
         else:
-            msg = "The following images failed:\n"
-            for test_data in test_data_list:
-                if not test_data.overall_passed:
-                    msg += "\t" + test_data.image + "\n"
-            Errors.add_email_msg(msg)
             html = open(test_config.html_log)
-            Errors.add_email_attachment(html.name)
+            Errors.add_errors_out(html.name)
             html.close()
-
-            if test_config.email_enabled:
-                Emailer.send_email(test_config.mail_to, test_config.mail_server,
-                test_config.mail_subject, Errors.email_body, Errors.email_attachs)
+        
+        if test_config.jenkins:
+            setupAttachments(Errors.errors_out, test_config)
 
     def _run_autopsy_ingest(test_data):
         """Run Autopsy ingest for the image in the given TestData.
@@ -231,7 +215,11 @@ class TestRunner(object):
 
         Reports.generate_reports(test_data)
         if(not test_data.overall_passed):
-            Errors.add_email_attachment(test_data.common_log_path)
+            diffFiles = [ f for f in os.listdir(test_data.output_path) if os.path.isfile(os.path.join(test_data.output_path,f)) ]
+            for f in diffFiles:
+               if f.endswith("Diff.txt"):
+                  Errors.add_errors_out(os.path.join(test_data.output_path, f))
+            Errors.add_errors_out(test_data.common_log_path)
         return logres
 
     def _extract_gold(test_data):
@@ -299,7 +287,6 @@ class TestRunner(object):
             shutil.copy(test_data.sorted_log, error_pth)
         except IOError as e:
             Errors.print_error(str(e))
-            Errors.add_email_message("Not rebuilt properly")
             print(str(e))
             print(traceback.format_exc())
         # Rebuild the HTML report
@@ -361,6 +348,8 @@ class TestRunner(object):
         test_data.ant.append("-Dgold_path=" + test_config.gold)
         test_data.ant.append("-Dout_path=" +
         make_local_path(test_data.output_path))
+        if test_config.jenkins:
+            test_data.ant.append("-Ddiff_dir="+ test_config.diff_dir)
         test_data.ant.append("-Dignore_unalloc=" + "%s" % test_config.args.unallocated)
         test_data.ant.append("-Dtest.timeout=" + str(test_config.timeout))
 
@@ -578,6 +567,7 @@ class TestConfiguration(object):
         images: a listof_Image, the images to be tested
         timeout: a Nat, the amount of time before killing the test
         ant: a listof_String, the ant command to run the tests
+        jenkins: a boolean, is this test running through a Jenkins job?
     """
 
     def __init__(self, args):
@@ -604,11 +594,7 @@ class TestConfiguration(object):
         # Infinite Testing info
         timer = 0
         self.images = []
-        # Email info
-        self.email_enabled = args.email_enabled
-        self.mail_server = ""
-        self.mail_to = ""
-        self.mail_subject = ""
+        self.jenkins = False
         # Set the timeout to something huge
         # The entire tester should not timeout before this number in ms
         # However it only seems to take about half this time
@@ -646,15 +632,18 @@ class TestConfiguration(object):
             if parsed_config.getElementsByTagName("golddir"):
                 self.gold = parsed_config.getElementsByTagName("golddir")[0].getAttribute("value").encode().decode("utf_8")
                 self.img_gold = make_path(self.gold, 'tmp')
-
+            if parsed_config.getElementsByTagName("jenkins"):
+                self.jenkins = True
+                if parsed_config.getElementsByTagName("diffdir"):
+                    self.diff_dir = parsed_config.getElementsByTagName("diffdir")[0].getAttribute("value").encode().decode("utf_8")
+            else:
+                self.jenkins = False
             self._init_imgs(parsed_config)
             self._init_build_info(parsed_config)
-            self._init_email_info(parsed_config)
 
         except IOError as e:
             msg = "There was an error loading the configuration file.\n"
             msg += "\t" + str(e)
-            Errors.add_email_msg(msg)
             logging.critical(traceback.format_exc())
             print(traceback.format_exc())
 
@@ -687,7 +676,6 @@ class TestConfiguration(object):
             else:
                 msg = "File: " + value + " doesn't exist"
                 Errors.print_error(msg)
-                Errors.add_email_msg(msg)
         image_count = len(self.images)
 
         # Sanity check to see if there are obvious gold images that we are not testing
@@ -701,27 +689,6 @@ class TestConfiguration(object):
         elif (image_count < gold_count):
             print("******Alert: There are more gold standards than input images, this will not check all gold Standards.\n")
 
-    def _init_email_info(self, parsed_config):
-        """Initializes email information dictionary"""
-        email_elements = parsed_config.getElementsByTagName("email")
-        if email_elements:
-            mail_to = email_elements[0]
-            self.mail_to = mail_to.getAttribute("value").encode().decode("utf_8")
-        mail_server_elements = parsed_config.getElementsByTagName("mail_server")
-        if mail_server_elements:
-            mail_from = mail_server_elements[0]
-            self.mail_server = mail_from.getAttribute("value").encode().decode("utf_8")
-        subject_elements = parsed_config.getElementsByTagName("subject")
-        if subject_elements:
-            subject = subject_elements[0]
-            self.mail_subject = subject.getAttribute("value").encode().decode("utf_8")
-        if self.mail_server and self.mail_to and self.args.email_enabled:
-            self.email_enabled = True
-            print("Email will be sent to ", self.mail_to)
-        else:
-            self.email_enabled = False
-            print("No email will be sent.")
-
 
 #-------------------------------------------------#
 #     Functions relating to comparing outputs     #
@@ -799,11 +766,7 @@ class TestResultsDiffer(object):
             diff_file = codecs.open(diff_path, "wb", "utf_8")
             dffcmdlst = ["diff", output_file, gold_file]
             subprocess.call(dffcmdlst, stdout = diff_file)
-            Errors.add_email_attachment(diff_path)
-            msg = "There was a difference in "
-            msg += os.path.basename(output_file) + ".\n"
-            Errors.add_email_msg(msg)
-            Errors.print_error(msg)
+            Errors.add_errors_out(diff_path)
             return False
         else:
             return True
@@ -1242,7 +1205,6 @@ class Logs(object):
             # Set the TestData start time based off the first line of autopsy.log.0
             # *** If logging time format ever changes this will break ***
             test_data.start_date = log.readline().split(" org.")[0]
-
             # Set the test_data ending time based off the "create" time (when the file was copied)
             test_data.end_date = time.ctime(os.path.getmtime(log_path))
         except IOError as e:
@@ -1261,27 +1223,27 @@ class Logs(object):
 
             version_line = search_logs("INFO: Application name: Autopsy, version:", test_data)[0]
             test_data.autopsy_version = get_word_at(version_line, 5).rstrip(",")
-
             test_data.heap_space = search_logs("Heap memory usage:", test_data)[0].rstrip().split(": ")[1]
-
+            
             ingest_line = search_logs("Ingest (including enqueue)", test_data)[0]
             test_data.total_ingest_time = get_word_at(ingest_line, 6).rstrip()
-
-            message_line = search_log_set("autopsy", "Ingest messages count:", test_data)[0]
-            test_data.ingest_messages = int(message_line.rstrip().split(": ")[2])
-
-            files_line = search_log_set("autopsy", "Indexed files count:", test_data)[0]
-            test_data.indexed_files = int(files_line.rstrip().split(": ")[2])
-
-            chunks_line = search_log_set("autopsy", "Indexed file chunks count:", test_data)[0]
-            test_data.indexed_chunks = int(chunks_line.rstrip().split(": ")[2])
+            
+            message_line_count = find_msg_in_log_set("Ingest messages count:", test_data)
+            test_data.indexed_files = message_line_count
+            
+            files_line_count = find_msg_in_log_set("Indexed files count:", test_data)
+            test_data.indexed_files = files_line_count
+            
+            chunks_line_count = find_msg_in_log_set("Indexed file chunks count:", test_data)
+            test_data.indexed_chunks = chunks_line_count
+            
         except (OSError, IOError) as e:
             Errors.print_error("Error: Unable to find the required information to fill test_config data.")
             Errors.print_error(str(e) + "\n")
             logging.critical(traceback.format_exc())
             print(traceback.format_exc())
         try:
-            service_lines = search_log("autopsy.log.0", "to process()", test_data)
+            service_lines = find_msg_in_log("autopsy.log.0", "to process()", test_data)
             service_list = []
             for line in service_lines:
                 words = line.split(" ")
@@ -1464,24 +1426,12 @@ class Errors:
     Attributes:
         printout: a listof_String, the non-error messages that were printed
         printerror: a listof_String, the error messages that were printed
-        email_body: a String, the body of the report email
-        email_msg_prefix: a String, the prefix for lines added to the email
         email_attchs: a listof_pathto_File, the files to be attached to the
         report email
     """
     printout = []
     printerror = []
-    email_body = ""
-    email_msg_prefix = "Configuration"
-    email_attachs = []
-
-    def set_testing_phase(image_name):
-        """Change the email message prefix to be the given testing phase.
-
-        Args:
-            image_name: a String, representing the current image being tested
-        """
-        Errors.email_msg_prefix = image_name
+    errors_out = []
 
     def print_out(msg):
         """Print out an informational message.
@@ -1506,21 +1456,13 @@ class Errors:
         Errors.printout = []
         Errors.printerror = []
 
-    def add_email_msg(msg):
-        """Add the given message to the body of the report email.
-
-        Args:
-            msg: a String, the message to be added to the email
-        """
-        Errors.email_body += Errors.email_msg_prefix + ":" + msg
-
-    def add_email_attachment(path):
+    def add_errors_out(path):
         """Add the given file to be an attachment for the report email
 
         Args:
             file: a pathto_File, the file to add
         """
-        Errors.email_attachs.append(path)
+        Errors.errors_out.append(path)
 
 
 class DiffResults(object):
@@ -1602,7 +1544,6 @@ class Args(object):
         self.exception = False
         self.exception_string = ""
         self.fr = False
-        self.email_enabled = False
 
     def parse(self):
         """Get the command line arguments and parse them."""
@@ -1662,8 +1603,6 @@ class Args(object):
             elif arg == "-fr" or arg == "--forcerun":
                 print("Not downloading new images")
                 self.fr = True
-            elif arg == "--email":
-                self.email_enabled = True
             else:
                 print(usage())
                 return False
@@ -1769,6 +1708,40 @@ def search_log_set(type, string, test_data):
             log.close()
     return results
 
+def find_msg_in_log_set(string, test_data):
+   """Count how many strings of a certain type are in a log set.
+
+   Args:
+      string: the String to search for.
+      test_data: the TestData containing the logs to search.
+   Returns:
+      an int, the number of occurances of the string type.
+   """
+   count = 0
+   try:
+      line = search_log_set("autopsy", string, test_data)[0]
+      count = int(line.rstrip().split(": ")[2])
+   except (Exception) as e:
+      # there weren't any matching messages found
+      pass
+   return count
+            
+def find_msg_in_log(log, string, test_data):
+   """Get the strings of a certain type that are in a log.
+
+   Args:
+      string: the String to search for.
+      test_data: the TestData containing the log to search.
+   Returns:
+      a listof_String, the lines on which the String was found. 
+   """
+   lines = []
+   try:
+      lines = search_log("autopsy.log.0", string, test_data)[0]
+   except (Exception) as e:
+      # there weren't any matching messages found
+      pass
+   return lines
 
 def clear_dir(dir):
     """Clears all files from a directory and remakes it.
@@ -1838,11 +1811,34 @@ def find_file_in_dir(dir, name, ext):
     except:
         raise DirNotFoundException(dir)
 
+def setupAttachments(attachments, test_config):
+    """Move email attachments to the location specified in the config file.
+       Used for Jenkins build.
+       
+    Args:
+       attachments: a listof_String, the files to be moved
+       test_config: TestConfiguration, used to determine where to move the files to
+    """
+    call = ['pwd']
+    subprocess.call(call)
+
+    # remove old diff files
+    filelist = [f for f in os.listdir(test_config.diff_dir) if (f.endswith(".txt") or f.endswith(".html"))]
+    for f in filelist:
+        if os.path.isfile(test_config.diff_dir + "/" + f):
+            os.remove(test_config.diff_dir + "/" + f)
+
+    # move in the new diff files
+    for file in attachments:
+        filename = ntpath.basename(file)
+        destination = os.path.join(test_config.diff_dir, filename)
+        call = ['cp', file, destination]
+        subprocess.call(call)
+        
 
 class OS:
   LINUX, MAC, WIN, CYGWIN = range(4)
 
-
 if __name__ == "__main__":
     global SYS
     if _platform == "linux" or _platform == "linux2":
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index d2d332f439..289f1fa5a0 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -54,7 +54,6 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
 
     private static final Logger logger = Logger.getLogger(ThunderbirdMboxFileIngestModule.class.getName());
     private IngestServices services = IngestServices.getInstance();
-    private int messageId = 0; // RJCTODO: Not thread safe
     private FileManager fileManager;
     private IngestJobContext context;
 
@@ -122,7 +121,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
 
         if (abstractFile.getSize() >= services.getFreeDiskSpace()) {
             logger.log(Level.WARNING, "Not enough disk space to write file to disk.");
-            IngestMessage msg = IngestMessage.createErrorMessage(messageId++, EmailParserModuleFactory.getModuleName(), EmailParserModuleFactory.getModuleName(),
+            IngestMessage msg = IngestMessage.createErrorMessage(EmailParserModuleFactory.getModuleName(), EmailParserModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace",
                     abstractFile.getName()));
@@ -397,7 +396,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
     }
 
     void postErrorMessage(String subj, String details) {
-        IngestMessage ingestMessage = IngestMessage.createErrorMessage(messageId++, EmailParserModuleFactory.getModuleVersion(), subj, details);
+        IngestMessage ingestMessage = IngestMessage.createErrorMessage(EmailParserModuleFactory.getModuleVersion(), subj, details);
         services.postMessage(ingestMessage);
     }