Index: src/django_gheat/gheat/admin.py
===================================================================
--- src/django_gheat/gheat/admin.py	(revision 9592)
+++ src/django_gheat/gheat/admin.py	(revision 9593)
@@ -20,5 +20,5 @@
 
 class OrganizationAdmin(admin.ModelAdmin):
-  list_display = ['name']
+  list_display = ['name', 'fullname']
   ordering = ['name']
 admin.site.register(Organization, OrganizationAdmin)
Index: src/django_gheat/gheat/management/commands/import_nodes.py
===================================================================
--- src/django_gheat/gheat/management/commands/import_nodes.py	(revision 9592)
+++ src/django_gheat/gheat/management/commands/import_nodes.py	(revision 9593)
@@ -3,4 +3,7 @@
 #
 # Script for importing nodes from yaml information generated by gformat.py
+#
+# Example: $ ~/wleiden/node-config/genesis/tools/gformat.py  full-export |
+# ./manage.py import_nodes -
 #
 # Rick van der Zwet <info@rickvanderzwet.nl>
@@ -25,6 +28,11 @@
   args = '[<filename>]'
   help = 'Specify - to read from stdin'
+  option_list = BaseCommand.option_list + (
+    make_option('-g', '--debug', dest='debug', default='False', help="Debug", action="store_true"),
+  )
 
   def handle(self, *args, **options):
+    if options['debug']:
+      logger.setLevel(logging.DEBUG)
     if len(args) == 0:
       self.print_help(sys.argv[0],sys.argv[1])
@@ -46,8 +54,20 @@
     hosts = yaml.load(fh)
     for host,items in hosts.iteritems():
-      node, created = Node.objects.get_or_create(name=host,
-         latitude=items['latitude'],longitude=items['longitude'])
+      for iface_key in [x for x in items.keys() if x.startswith('iface_')]:
+        if items[iface_key].has_key('ssid'):
+          org = Organization.get_by_ssid(items[iface_key]['ssid'])
+          if org: break
+          logger.error("NO Organization for SSID '%s'", items[iface_key]['ssid'])
+
+      if not org:
+        logger.warning("NO Organization for Node '%s'", host)
+
+      node, created = Node.objects.get_or_create(name=host)
       if created:
-        logger.info("Created Node '%s'" % node))
-    logger.info("Processed %s items" % len(hosts))
+        logger.info("Created Node '%s'", node)
+      node.latitude = items['latitude']
+      node.longitude = items['longitude']
+      node.organization = org
+      node.save()
+    logger.info("Processed %s items", len(hosts))
 
Index: src/django_gheat/gheat/models.py
===================================================================
--- src/django_gheat/gheat/models.py	(revision 9592)
+++ src/django_gheat/gheat/models.py	(revision 9593)
@@ -67,18 +67,34 @@
   def get_name_by_ssid(ssid):
     """ Try to determine the organization via the SSID """
+    ssid = ssid.lower()
     name = None
     if ssid.startswith('ap') and ssid.endswith('wleiden.net'):
       name = 'WirelessLeiden'
-    elif ssid.startswith('ap') and 'WirelessLeiden' in ssid:
+    elif ssid.startswith('il-') and ssid.endswith('wleiden.net'):
       name = 'WirelessLeiden'
+    elif ssid.startswith('ap') and 'wirelessleiden' in ssid:
+      name = 'WirelessLeiden'
+    elif ssid.startswith('ap-') and 'westeinder' in ssid:
+      name = 'WirelessPlassen'
+    elif ssid.endswith('walphen.net'):
+      name = 'WirelessAlphen'
+    elif 'wirelessarnhem' in ssid:
+      name = 'WirelessArnhem'
     return name
 
+  @staticmethod
+  def get_by_ssid(ssid):
+    name = Organization.get_name_by_ssid(ssid)
+    if not name:
+      return None
+    else:
+      return Organization.objects.get(name=name)
+
+
 class Node(models.Model):
-  name = models.CharField(max_length=50)
+  name = models.CharField(max_length=50, unique=True)
   latitude = models.FloatField(null=True,blank=True)
   longitude = models.FloatField(null=True,blank=True)
   organization = models.ForeignKey(Organization,null=True, blank=True)
-  class Meta:
-    unique_together = ('name', 'organization')
 
   def __unicode__(self):
Index: src/django_gheat/gheat/sql/organization.sql
===================================================================
--- src/django_gheat/gheat/sql/organization.sql	(revision 9592)
+++ src/django_gheat/gheat/sql/organization.sql	(revision 9593)
@@ -1,1 +1,1 @@
-INSERT INTO `gheat_organization` VALUES (1,'Stichting Wireless Leiden','WirelessLeiden');
+INSERT INTO `gheat_organization` VALUES (1,'Stichting Wireless Leiden','WirelessLeiden'),(2,'Stichting Wireless Arnhem','WirelessArnhem'),(3,'Stichting Wireless Kaag & Braassem','WirelessPlassen'),(4,'Stichting Wireless Alphen','WirelessAlphen');