diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -89,7 +89,6 @@ int distrend_handle_request(struct distr
    client request handlers
  */
 int distrend_handle_version(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data);
-int distrend_handle_ping(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data);
 
 /* **************XML Functions**************** */
 void update_general_info(struct general_info *geninfo);
@@ -180,7 +179,6 @@ int main(int argc, char *argv[])
     }
 
   distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_VERSION, &distrend_handle_version);
-  distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_PING, &distrend_handle_ping);
 
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
@@ -190,7 +188,8 @@ int main(int argc, char *argv[])
       int clientrequest = 0; /*< temporary example variable, will be replaced when we can handle messages */
 
       multiio_poll(multiio);
-      /*      distrend_accept(general_info.config->listens); */
+
+      tabletennis_serve(general_info.config->listens->tabletennis);
 
       /* Run the watchdog, @TODO: like every 10 mins or something */
       frame_watchdog(general_info.conn);
@@ -277,24 +276,6 @@ int distrend_handle_version(struct gener
   return 0;
 }
 
-int distrend_handle_ping(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data)
-{
-  struct distren_request *pong_req;
-
-  if(req_len > 32)
-    distrend_send_disconnect(client, "You have tried to send a PING packet with a length longer than 32 bytes.");
-
-  /**
-      respond to the client using the data he sent in his PONG
-      command.
-   */
-  distren_request_new(&pong_req, req_len, DISTREN_REQUEST_PONG);
-  distrend_client_write_request(client, pong_req, req_data);
-  distren_request_free(pong_req);
-
-  return 0;
-}
-
 /**
    Performs command stored in a client's request. @TODO: Fill stub
 */
@@ -599,6 +580,7 @@ int interactiveTest(int test, multiio_co
        while(1)
 	 {
 	   multiio_poll(multiio);
+	   tabletennis_serve(geninfo->config->listens->tabletennis);
 	 }
        break;