diff --git a/importer/migrations/0006_auto__add_field_speciesimportevent_max_diameter_conversion_factor__add.py b/importer/migrations/0006_auto__add_field_speciesimportevent_max_diameter_conversion_factor__add.py
new file mode 100644
index 00000000..3283f0ee
--- /dev/null
+++ b/importer/migrations/0006_auto__add_field_speciesimportevent_max_diameter_conversion_factor__add.py
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'SpeciesImportEvent.max_diameter_conversion_factor'
+        db.add_column('importer_speciesimportevent', 'max_diameter_conversion_factor',
+                      self.gf('django.db.models.fields.FloatField')(default=1.0),
+                      keep_default=False)
+
+        # Adding field 'SpeciesImportEvent.max_tree_height_conversion_factor'
+        db.add_column('importer_speciesimportevent', 'max_tree_height_conversion_factor',
+                      self.gf('django.db.models.fields.FloatField')(default=1.0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'SpeciesImportEvent.max_diameter_conversion_factor'
+        db.delete_column('importer_speciesimportevent', 'max_diameter_conversion_factor')
+
+        # Deleting field 'SpeciesImportEvent.max_tree_height_conversion_factor'
+        db.delete_column('importer_speciesimportevent', 'max_tree_height_conversion_factor')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'importer.speciesimportevent': {
+            'Meta': {'object_name': 'SpeciesImportEvent'},
+            'commited': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'completed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'errors': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'field_order': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'file_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_diameter_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'max_tree_height_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'})
+        },
+        'importer.speciesimportrow': {
+            'Meta': {'object_name': 'SpeciesImportRow'},
+            'data': ('django.db.models.fields.TextField', [], {}),
+            'errors': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'idx': ('django.db.models.fields.IntegerField', [], {}),
+            'import_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['importer.SpeciesImportEvent']"}),
+            'merged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'species': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['treemap.Species']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'importer.treeimportevent': {
+            'Meta': {'object_name': 'TreeImportEvent'},
+            'base_import_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['treemap.ImportEvent']"}),
+            'canopy_height_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'commited': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'completed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'diameter_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'errors': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'field_order': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'file_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'plot_length_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'plot_width_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'tree_height_conversion_factor': ('django.db.models.fields.FloatField', [], {'default': '1.0'})
+        },
+        'importer.treeimportrow': {
+            'Meta': {'object_name': 'TreeImportRow'},
+            'data': ('django.db.models.fields.TextField', [], {}),
+            'errors': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'finished': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'idx': ('django.db.models.fields.IntegerField', [], {}),
+            'import_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['importer.TreeImportEvent']"}),
+            'plot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['treemap.Plot']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'treemap.importevent': {
+            'Meta': {'object_name': 'ImportEvent'},
+            'file_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_date': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'treemap.neighborhood': {
+            'Meta': {'object_name': 'Neighborhood'},
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'county': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'geometry': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'region_id': ('django.db.models.fields.IntegerField', [], {}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+        },
+        'treemap.plot': {
+            'Meta': {'object_name': 'Plot'},
+            'address_city': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'address_street': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'address_zip': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'data_owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owner'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'geocoded_accuracy': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'geocoded_address': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'geocoded_lat': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'geocoded_lon': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'geometry': ('django.contrib.gis.db.models.fields.PointField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['treemap.ImportEvent']"}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'last_updated_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'plot_updated_by'", 'to': "orm['auth.User']"}),
+            'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'neighborhood': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['treemap.Neighborhood']", 'null': 'True', 'symmetrical': 'False'}),
+            'neighborhoods': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'owner_additional_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'owner_additional_properties': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'owner_orig_id': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'powerline_conflict_potential': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'present': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'readonly': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sidewalk_damage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
+            'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'zipcode': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['treemap.ZipCode']", 'null': 'True', 'blank': 'True'})
+        },
+        'treemap.resource': {
+            'Meta': {'object_name': 'Resource'},
+            'aq_nox_avoided_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_nox_dep_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_ozone_dep_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_pm10_avoided_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_pm10_dep_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_sox_avoided_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_sox_dep_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'aq_voc_avoided_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'bvoc_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'co2_avoided_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'co2_sequestered_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'co2_storage_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'electricity_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hydro_interception_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meta_species': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'natural_gas_dbh': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'})
+        },
+        'treemap.species': {
+            'Meta': {'object_name': 'Species'},
+            'alternate_symbol': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'bloom_period': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'common_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cultivar_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'fact_sheet': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'fall_conspicuous': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'family': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'flower_conspicuous': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'fruit_period': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'genus': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'itree_code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'native_status': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'other_part_of_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'palatable_human': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'plant_guide': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'resource': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['treemap.Resource']", 'null': 'True', 'symmetrical': 'False'}),
+            'scientific_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'species': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'tree_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'v_max_dbh': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'v_max_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'v_multiple_trunks': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'wildlife_value': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'treemap.zipcode': {
+            'Meta': {'object_name': 'ZipCode'},
+            'geometry': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'zip': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['importer']
\ No newline at end of file
diff --git a/importer/models.py b/importer/models.py
index 2ab65d2b..50672cd8 100644
--- a/importer/models.py
+++ b/importer/models.py
@@ -115,6 +115,10 @@ class SpeciesImportEvent(GenericImportEvent):
     A TreeImportEvent represents an attempt to upload a csv containing
     species information
     """
+
+    max_diameter_conversion_factor = models.FloatField(default=1.0)
+    max_tree_height_conversion_factor = models.FloatField(default=1.0)
+
     def create_row(self, *args, **kwargs):
         return SpeciesImportRow.objects.create(*args, **kwargs)
 
@@ -177,8 +181,6 @@ class TreeImportEvent(GenericImportEvent):
 
     base_import_event = models.ForeignKey(ImportEvent)
 
-    # We can do some numeric conversions
-    # TODO: Support numeric conversions
     plot_length_conversion_factor = models.FloatField(default=1.0)
     plot_width_conversion_factor = models.FloatField(default=1.0)
     diameter_conversion_factor = models.FloatField(default=1.0)
@@ -377,6 +379,14 @@ def safe_pos_float(self, fld):
         else:
             return i
 
+    def convert_units(self, data, converts):
+        INCHES_TO_DBH_FACTOR = 1.0 / settings.DBH_TO_INCHES_FACTOR
+
+        # Similar to tree
+        for fld, factor in converts.iteritems():
+            if fld in data and factor != 1.0:
+                data[fld] = float(data[fld]) * factor * INCHES_TO_DBH_FACTOR
+
     def validate_numeric_fields(self):
         def cleanup(fields, fn):
             has_errors = False
@@ -758,6 +768,15 @@ def commit_row(self):
         if species is None:
             species = Species()
 
+        # Convert units
+        self.convert_units(data, {
+            fields.species.MAX_DIAMETER:
+            self.import_event.max_diameter_conversion_factor,
+
+            fields.species.MAX_HEIGHT:
+            self.import_event.max_tree_height_conversion_factor
+        })
+
         #TODO: Update tree count nonsense
 
         for modelkey, importdatakey in SpeciesImportRow.SPECIES_MAP.iteritems():
@@ -813,21 +832,22 @@ def commit_row(self):
         # Get our data
         data = self.cleaned
 
-        # Convert units
-        converts = {
-            fields.trees.PLOT_WIDTH: self.import_event.plot_width_conversion_factor,
-            fields.trees.PLOT_LENGTH: self.import_event.plot_length_conversion_factor,
-            fields.trees.DIAMETER: self.import_event.diameter_conversion_factor,
-            fields.trees.TREE_HEIGHT: self.import_event.tree_height_conversion_factor,
-            fields.trees.CANOPY_HEIGHT: self.import_event.canopy_height_conversion_factor
-        }
+        self.convert_units(data, {
+            fields.trees.PLOT_WIDTH:
+            self.import_event.plot_width_conversion_factor,
 
-        INCHES_TO_DBH_FACTOR = 1.0 / settings.DBH_TO_INCHES_FACTOR
+            fields.trees.PLOT_LENGTH:
+            self.import_event.plot_length_conversion_factor,
 
-        for fld, factor in converts.iteritems():
-            if fld in data and factor != 1.0:
-                data[fld] = float(data[fld]) * factor * INCHES_TO_DBH_FACTOR
+            fields.trees.DIAMETER:
+            self.import_event.diameter_conversion_factor,
+
+            fields.trees.TREE_HEIGHT:
+            self.import_event.tree_height_conversion_factor,
 
+            fields.trees.CANOPY_HEIGHT:
+            self.import_event.canopy_height_conversion_factor
+        })
 
         # We need the import event from treemap.models
         # the names of things are a bit odd here but
diff --git a/static/js/importer.js b/static/js/importer.js
index 71b316ca..bc4d2165 100644
--- a/static/js/importer.js
+++ b/static/js/importer.js
@@ -19,7 +19,8 @@ var I = {};
             return loadTemplateCache[t];
         }
     };
-    I.loadTemplate = loadTemplate
+
+    I.loadTemplate = loadTemplate;
 
     /** Dummy function (for now) **/
     I.signalError = function(error) {};
@@ -1049,61 +1050,71 @@ I.init.list = function() {
     }
 
     // Create unit types dialog
-    var $unitsDialog = $("#unitsdialog");
-
     var conversions =
         { "Inches" : 1.0,
           "Meters": 39.3701,
-          "Centimeters": 0.393701 }
+          "Centimeters": 0.393701 };
 
-    var $select = _.reduce(conversions, function ($sel,factor,label) {
-        return $sel.append($("<option>")
-                           .attr("value",factor)
-                           .text(label));
-    }, $("<select>"));
+    function setupUnitsDialog($unitsDialog, $submit, $form) {
 
-    $unitsDialog.find("tr").each(function (i,row) {
-        if (i > 0) {
-            $(row).append($("<td>").append($select.clone()));
-        }
-    });
+        var $select = _.reduce(conversions, function ($sel,factor,label) {
+            return $sel.append($("<option>")
+                               .attr("value",factor)
+                               .text(label));
+        }, $("<select>"));
 
-    $("body").append($unitsDialog);
+        $unitsDialog.find("tr").each(function (i,row) {
+            if (i > 0) {
+                $(row).append($("<td>").append($select.clone()));
+            }
+        });
 
-    $unitsDialog.dialog({
-        autoOpen: false,
-        width: 350,
-        modal: true
-    });
+        $("body").append($unitsDialog);
 
-    $("#submittree").click(function() {
-        $unitsDialog.dialog('open');
-    });
+        $unitsDialog.dialog({
+            autoOpen: false,
+            width: 350,
+            modal: true
+        });
 
-    $unitsDialog.find(".cancel").click(function() {
-        $unitsDialog.dialog('close');
-    });
+        $submit.click(function() {
+            $unitsDialog.dialog('open');
+        });
 
-    $unitsDialog.find(".create").click(function() {
-        var fields = {};
-        // Extract field values
-        $unitsDialog.find("tr").each(function (i,row) {
-            if (i > 0) {
-                var tds = $(row).find("td");
-                fields["unit_" + tds.first().html().replace(" ","_").toLowerCase()] =
-                    tds.last().find("select").val();
-            }
+        $unitsDialog.find(".cancel").click(function() {
+            $unitsDialog.dialog('close');
         });
 
-        // Update hidden format fields
-        var $form = $("#treeform");
-        _.each(fields, function(val,label) {
-            $form.find("input[name=" + label  + "]")
-                .attr("value", val);
+        $unitsDialog.find(".create").click(function() {
+            var fields = {};
+            // Extract field values
+            $unitsDialog.find("tr").each(function (i,row) {
+                if (i > 0) {
+                    var tds = $(row).find("td");
+                    fields["unit_" + tds.first().html().replace(" ","_").toLowerCase()] =
+                        tds.last().find("select").val();
+                }
+            });
+
+            // Update hidden format fields
+            _.each(fields, function(val,label) {
+                $form.find("input[name=" + label  + "]")
+                    .attr("value", val);
+            });
+
+            $form.submit();
         });
+    }
+
+
+    setupUnitsDialog($("#treeunitsdialog"),
+                    $("#submittree"),
+                    $("#treeform"));
+
+    setupUnitsDialog($("#speciesunitsdialog"),
+                    $("#submitspecies"),
+                    $("#speciesform"));
 
-        $form.submit();
-    });
 
     // Start the updater
     update_counts();
diff --git a/templates/importer/list.html b/templates/importer/list.html
index 204edf15..0d5ee6a7 100644
--- a/templates/importer/list.html
+++ b/templates/importer/list.html
@@ -17,7 +17,17 @@
 
 {% block middle_panel %}
 
-  <div id="unitsdialog">
+  <div id="speciesunitsdialog">
+    <table>
+      <tr><th>Field</th><th>Unit</th></tr>
+      <tr><td>Max DBH</td></tr>
+      <tr><td>Max Height</td></tr>
+    </table>
+    <button class="create">Create</button>
+    <button class="cancel">Cancel</button>
+  </div>
+
+  <div id="treeunitsdialog">
     <table>
       <tr><th>Field</th><th>Unit</th></tr>
       <tr><td>Plot Length</td></tr>
@@ -47,11 +57,11 @@ <h2>Tree Import</h2>
   </div>
   <div class="importer-upload">
     <h2>Species Import</h2>
-    <form method="POST" action="{% url 'importer.views.create' %}" enctype="multipart/form-data">
+    <form id="speciesform" method="POST" action="{% url 'importer.views.create' %}" enctype="multipart/form-data">
       <input type="hidden" name="type" value="species"></input>
       File to Upload: <input type="file" name="file"></input>
-      <input type="submit" name="go" value="Go &raquo;" class="btn btn-success"></input>
     </form>
+    <button id="submitspecies" class="btn btn-success">Go &raquo;</button>
   </div>
 </div>