diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -73,23 +73,26 @@ we get a key generated on the server, an
 
 */
 
-
-// We need the conf parser code from options.c here!!!
-char *username = "unregistered"; // get this from conf
-
-
+  int cont = 1;
+  struct distrend_listenset *listenset;
+  struct distrend_config *config;
+  distrend_do_config(argc, argv, &config);
 
-// Checks if the conf is left at the default username
-int registered;
- error: People, this is not C++
-if(username == "unregistered") {
-  fprintf(stderr,"\nYou have not set your username in distrend.conf!\nIf you need to register a username, run distrend -c username email@example.com\n\n");
-  registered = 0;
-}
-else{
-  fprintf(stderr,"Logging into the DistRen server...\n");
-}
+  distrend_listen(&listenset, config);
+  /* This is called the ``main loop'' */
+  while(cont)
+    {
+      struct distren_action *action;
+      
+      distrend_accept(&action);
+      cont = distrend_do(action);
+      distrend_action_free(action);
+    }
+  
+  distrend_unlisten(listenset);
+  distrend_config_free(config);
 
+  return 0;
 }