Index: trunk/ppMerge/src/ppMerge.c
===================================================================
--- trunk/ppMerge/src/ppMerge.c	(revision 5860)
+++ trunk/ppMerge/src/ppMerge.c	(revision 5862)
@@ -1,3 +1,3 @@
-# include "ppImage.h"
+# include "ppMerge.h"
 
 int main (int argc, char **argv) {
@@ -6,4 +6,5 @@
     ppConfig config;
     ppOptions options;
+
 
     psTimerStart("merge");
@@ -15,5 +16,5 @@
     // Get camera configuration from header if not already defined
     // Construct camera in preparation for reading
-    ppMergeParseCamera (&data, &config, argv);
+    ppMergeParseCamera (&data, &config);
 
     // Set various tasks (define optional operations)
@@ -27,6 +28,43 @@
 
     // output options
-    // ppImageOutput (&data, &options, &config);
+    ppMergeOutput (&data, &options, &config);
 
     exit (0);
 }
+
+int speedTest (void) 
+{
+    # define NTEST 10000000
+    psStats *testData, *stats;
+    stats = psStatsAlloc (PS_STAT_ROBUST_MEAN);
+    psList *testList = psListAlloc (NULL);
+    psArray *testArray = psArrayAlloc (NTEST);
+
+    psTimerStart("merge");
+    for (int i = 0; i < NTEST; i++) {
+	testArray->data[i] = stats;
+    }
+    fprintf (stderr, "added %d objects to array: %f usec / obj\n", NTEST, 1e6*psTimerMark ("merge")/NTEST);
+
+    psTimerStart("merge");
+    for (int i = 0; i < NTEST; i++) {
+	psListAdd (testList, PS_LIST_TAIL, stats);
+    }
+    fprintf (stderr, "added %d objects to list: %f usec / obj\n", NTEST, 1e6*psTimerMark ("merge")/NTEST);
+
+    psTimerStart("merge");
+    for (int i = 0; i < NTEST; i++) {
+	testData = testArray->data[i];
+    }
+    fprintf (stderr, "pulled %d objects from array: %f usec / obj\n", NTEST, 1e6*psTimerMark ("merge")/NTEST);
+
+    psTimerStart("merge");
+    psListElem *tmpInput = (psListElem *) testList->head;
+    while (tmpInput != NULL) {
+	testData = tmpInput->data;
+	tmpInput = tmpInput->next;
+    }
+    fprintf (stderr, "pulled %d objects from list: %f usec / obj\n", NTEST, 1e6*psTimerMark ("merge")/NTEST);
+
+    exit (0);
+}