diff --git a/Makefile b/Makefile
index 90aa386..654c8c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 Q=@
 CC=gcc
-CFLAGS=-g -Wall -Wno-format-truncation
+CFLAGS=-g -Wall -Wno-format-truncation -pthread
 LDFLAGS=
 BUILD_DIR=./objects
 BIN=jsfw
diff --git a/client.c b/client.c
index e69de29..b049b8b 100644
--- a/client.c
+++ b/client.c
@@ -0,0 +1,6 @@
+#include<stdint.h>
+#include "client.h"
+
+void client_run(char * address, uint16_t port) {
+
+}
diff --git a/client.h b/client.h
index f76b042..6a7a14a 100644
--- a/client.h
+++ b/client.h
@@ -1,7 +1,8 @@
 // vi: set ft=c
 #ifndef CLIENT_H
 #define CLIENT_H
+#include <stdint.h>
 
-
+void client_run(char * address, uint16_t port);
 
 #endif
diff --git a/main.c b/main.c
index 1841ac4..0b8a64f 100644
--- a/main.c
+++ b/main.c
@@ -1,68 +1,70 @@
-#include<stdio.h>
-#include<sys/ioctl.h>
-#include<linux/joystick.h>
-#include<stdint.h>
-#include<fcntl.h>
-#include<stdlib.h>
-#include<string.h>
-#include<stdarg.h>
-#include<unistd.h>
-#include<pthread.h>
+#include <fcntl.h>
+#include <linux/joystick.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 
-#include "main.h"
+#include "client.h"
 #include "hid.h"
+#include "main.h"
 #include "server.h"
 #include "util.h"
 
-const char* USAGE[] = {
-        "jsfw client [address] [port]\n",
-        "jsfw server [port]\n",
+const char *USAGE[] = {
+    "jsfw client [address] [port]\n",
+    "jsfw server [port]\n",
 };
 const size_t EVENT_SIZE = sizeof(struct js_event);
 
-uint16_t parse_port(const char * str) {
+uint16_t parse_port(const char *str) {
     long long n = atoll(str);
-    if(n <= 0 || n > UINT16_MAX)
+    if (n <= 0 || n > UINT16_MAX)
         panicf("Invalid port: Expected a number in the range 1..%d, got '%s'\n", UINT16_MAX, str);
     return n;
 }
 
 void server(uint16_t port) {
-    printf("Server (port: %u).\n", port);
+    printf("Server (port: %u).\n\n", port);
 
     pthread_t thread;
     pthread_create(&thread, NULL, hid_thread, NULL);
     server_run(port);
 }
 
-void client(char * address, uint16_t port) {
-    printf("JSFW Client (%s:%d)\n", address, port);
+void client(char *address, uint16_t port) {
+    printf("Client (%s:%d)\n\n", address, port);
+    client_run(address, port);
 }
 
-int main(int argc, char* argv[]) {
-    if(argc < 2) {
+int main(int argc, char *argv[]) {
+    if (argc < 2) {
         printf("Usage: %s", USAGE[0]);
         printf("       %s", USAGE[1]);
         return 1;
     }
 
-    char* mode = argv[1];
+    char *mode = argv[1];
 
-    if(strcmp(mode, "server") == 0) {
+    if (strcmp(mode, "server") == 0) {
 
-        if(argc < 3)
+        if (argc < 3)
             panicf("Usage: %s", USAGE[1]);
 
         uint16_t port = parse_port(argv[2]);
         server(port);
 
-    } else if(strcmp(mode, "client") == 0) {
+    } else if (strcmp(mode, "client") == 0) {
 
-        if(argc < 4)
+        if (argc < 4)
             panicf("Usage: %s", USAGE[0]);
 
-        char * address = argv[2];
-        uint16_t port = parse_port(argv[3]);
+        char    *address = argv[2];
+        uint16_t port    = parse_port(argv[3]);
         client(address, port);
 
     } else {