diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9c2fcdf..c654767 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,6 +28,6 @@ jobs:
           docker build . --tag ghcr.io/ngn13/massacr/scanner:latest
           docker push ghcr.io/ngn13/massacr/scanner:latest
           
-          cd ../database
-          docker build . --tag ghcr.io/ngn13/massacr/database:latest
-          docker push ghcr.io/ngn13/massacr/database:latest
+          cd ../api
+          docker build . --tag ghcr.io/ngn13/massacr/api:latest
+          docker push ghcr.io/ngn13/massacr/api:latest
diff --git a/.gitignore b/.gitignore
index 21edbcf..f9709ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-data/
-compose.yml
 docker-compose.yml
+compose.yml
diff --git a/README.md b/README.md
index 19a845c..381ebaa 100644
--- a/README.md
+++ b/README.md
@@ -1,64 +1,53 @@
-<h2 align="center">
-  massacr 🩸 mass IP/port scanner
-  </br>
-  a tool for scanning the entire internet
-  </br>
-  </br>
-  <img src="assets/web.png">
-</h2>
-
----
+# massacr 🩸 mass IP/port scanner toolkit
+An extensible toolkit for scanning the internet for TCP ports using SYN packets. 
+Consists of different tools and servers that interact which each other:
+```
+Scanner -> API -> Handler -> MongoDB -> Mongo-Express
+```
+- [Scanner](scanner/): SYN port scanner written in C, sends requests to the API with curl
+- [API](api/lib): Simple web API written with Flask, provides data to threaded handler
+- [Handler](api/main.py): A simple extensible Python function to process provided data. When its done processing, 
+it saves the processed data to the MongoDB database. Default handler gathers extra information about HTTP(S) servers.
+- [MongoDB](https://www.mongodb.com/what-is-mongodb): NoSQL database for storing all the data 
+- [Mongo-Express](https://github.com/mongo-express/mongo-express): Web-based MongoDB admin interface to interact with the data
 
 ## Deploy
-### Docker
-The project contains a scanner and a simple database with a web interface. Easiest way to deploy these two is to use 
-`docker-compose`. Here is an example configuration:
+Since there are multiple components of massacr, easiest 
+way to deploy is to use `docker-compose`, here is an example configuration:
 ```yml
 version: "3"
 services:
   scanner:
     image: ghcr.io/ngn13/massacr/scanner
-    command: --url=http://database:3231 --pwd=securepassword --limit=100
+    command: --url=http://api:5000 --limit=100
     depends_on:
-      - database
+      - api 
 
-  database:
-    image: ghcr.io/ngn13/massacr/database
+  api:
+    image: ghcr.io/ngn13/massacr/api
     restart: unless-stopped
     environment:
-      - PASSWORD=securepassword
-    ports:
-      - "127.0.0.1:3231:3231"
+      - API_MONGO=mongodb://mongo
+    depends_on:
+      - mongo
+
+  mongo:
+    image: mongo 
     volumes:
-      - ./data:/app/data
-```
-after deploying the containers, you can access the web interface at `http://localhost:3231`.
+      - ./db:/data/db:rw
 
-### From the source
-Another way to deploy these two applications, is to build them from the source.
-To build from source, first install all the dependencies and build tools: 
-```bash
-build-esssential libnet libnet-dev curl curl-dev go
-```
-Then clone the repository: 
-```bash
-git clone https://github.com/ngn13/massacr.git
-```
-Now change directory into the database and run the go build command:
-```bash
-cd massacr/database && go build .
-```
-Now change directory into the scanner and run the make command:
-```bash 
-cd ../scanner && make
+  interface:
+    image: mongo-express
+    depends_on:
+      - mongo
+    environment:
+      - ME_CONFIG_MONGODB_URL=mongodb://mongo
+    ports:
+      - "127.0.0.1:8081:8081"
 ```
+after deploying the containers, you can access the web interface at `http://localhost:8081`.
 
 ## Configuration
-### Database 
-All the configuration options for the database are set using environment variables:
-- `PASSWORD`: password, default is `default`
-- `PORT`: port for the web server, default is `3231`
-
 ### Scanner 
 You can list all the options with `--help`:
 ```
@@ -68,17 +57,18 @@ You can list all the options with `--help`:
 --ports    => Ports to scan for
 --limit    => Packets per second limit
 --debug    => Enable debug output
---url      => Database HTTP(S) URL
---pwd      => Database password
+--url      => API HTTP(S) URL
+--password => API password
 ```
 
-- Options are set using the `--<option>=<value>` syntax
+- Use the `--<option>=<value>` syntax to set options.
 - For the `--ports` option, you can specify a single port, or you can specify ranges with `-` (`1-100`) and multiple ports with `,` (`80,443,1234`)
 - Timeout is the time to wait after sending all the packets (in seconds), as the receiver thread may fell behind
-- `--limit` is set to 20 by default, **which is pretty slow, so you should increase it**
+- `--limit` is set to 20 by default, **which is pretty slow, so you should increase it.**
 
 > [!CAUTION]
-> Do not go overkill on the `--limit` option, you will most likely end up using all the bandwidth and crash the entire network
+> Do not go overkill on the `--limit` option, you will most likely end up using all the bandwidth 
+> and crash the entire network.
 
 Defaults for all the options are:
 ```
@@ -88,12 +78,21 @@ timeout  => 10
 ports    => common
 limit    => 20
 debug    => false
-url      => http://localhost:3231
-pwd      => default
+url      => http://localhost:5000 
+password => default
 ```
 
----
+### API/Handler
+Default API has few different options:
+- `API_MONGO`: MongoDB URL
+- `API_PASSWORD`: Password for API access
+- `API_USE_LOCAL`: Set to any value if you want API to listen only on the local interface (127.0.0.1)
+
+However you can modify these options and the handler itself by modifying [`api/main.py`](api/main.py).
+If you know a bit of python you can easily write your own handler for your specific use case. All the code 
+is well commented but feel free to create issues to ask questions if you are stuck.
 
 ## Resources 
+Here are some different resources that I used during the development:
 - [SYN scanning](https://nmap.org/book/synscan.html) (massacr does not exactly use SYN scan, it does not send RST packets)
 - [libnet](https://github.com/libnet/libnet) (provides an easy way to build and send raw network packets)
diff --git a/api/.gitignore b/api/.gitignore
new file mode 100644
index 0000000..9a69574
--- /dev/null
+++ b/api/.gitignore
@@ -0,0 +1,4 @@
+*/__pycache__
+__pycache__
+data
+venv
diff --git a/api/Dockerfile b/api/Dockerfile
new file mode 100644
index 0000000..e7e6837
--- /dev/null
+++ b/api/Dockerfile
@@ -0,0 +1,19 @@
+FROM python 
+
+WORKDIR /api
+COPY lib    ./lib
+COPY *.py   ./
+COPY *.txt  ./
+
+RUN pip install -r requirements.txt
+
+ARG API_PASSWORD 
+ENV API_PASSWORD $API_PASSWORD
+
+ARG API_USE_LOCAL 
+ENV API_USE_LOCAL $API_USE_LOCAL
+
+ARG API_MONGO 
+ENV API_MONGO $API_MONGO
+
+ENTRYPOINT ["python", "/api/main.py"] 
diff --git a/api/lib/__init__.py b/api/lib/__init__.py
new file mode 100644
index 0000000..4e0abe7
--- /dev/null
+++ b/api/lib/__init__.py
@@ -0,0 +1,99 @@
+"""
+
+ #  massacr/api | mass internet/ipv4 scanner
+ #  ========================================
+ #  written by ngn (https://ngn.tf) (2024)
+
+ #  This program is free software: you can redistribute it and/or modify
+ #  it under the terms of the GNU General Public License as published by
+ #  the Free Software Foundation, either version 3 of the License, or
+ #  (at your option) any later version.
+
+ #  This program is distributed in the hope that it will be useful,
+ #  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #  GNU General Public License for more details.
+
+ #  You should have received a copy of the GNU General Public License
+ #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""
+
+from pymongo.mongo_client import MongoClient
+from flask import Flask, request
+from threading import Thread 
+import logging as log
+
+class API:
+    def __init__(self, mongo_url: str, password: str, host: str, port: int) -> None:
+        self.handler = None
+        self.app = Flask(__name__)
+        self.mongo = MongoClient(mongo_url)
+        self.password = password
+        self.host = host 
+        self.port = port
+
+        werkzeug_log = log.getLogger("werkzeug")
+        werkzeug_log.setLevel(log.ERROR)
+        log.basicConfig(level=log.INFO, format="%(asctime)s [%(levelname)s]: %(message)s")
+
+        self.app.add_url_rule("/scanner/check", "/scanner/check", self.route_check)
+        self.app.add_url_rule("/scanner/add", "/scanner/add", self.route_add)
+
+    def db_add(self, ip: str, port: int, extra):
+        db = self.mongo["results"]
+        col = db["hosts"]
+        data = {
+            "ipv4": ip,
+            "ports": [port],
+            "data": [extra] if len(extra.keys()) != 0 else [],
+        }
+
+        found = col.find_one({"ipv4":  ip})
+        if not found:
+            return col.insert_one(data)
+       
+        if not port in found["ports"]:
+            col.update_one({"ipv4": ip}, {"$push": {"ports": port}})
+
+        if len(extra.keys()) != 0:
+            col.update_one({"ipv4": ip}, {"$push": {"data": extra}})
+
+    def set_handler(self, func):
+        self.handler = func
+
+    def run(self):
+        log.info("Trying to connect to mongodb")
+        try:
+            log.info(f"Connected to mongodb version {self.mongo.server_info()['version']}")
+        except Exception as e:
+            log.critical(f"Database connection failed: {e}")
+            exit(1)
+
+        log.info(f"Starting API server on {self.host}:{self.port}")
+        self.app.run(host=self.host, port=self.port)
+
+    def route_check(self):
+        password = request.args["pass"]
+        if self.password != password:
+            return "Bad password", 403
+        
+        log.info(f"Password check successful for {request.remote_addr}")
+        return "OK", 200
+
+    def route_add(self):
+        password = request.args["pass"]
+        port = request.args["port"]
+        ip = request.args["ip"]
+
+        if self.password != password:
+            return "Bad password", 403
+
+        if self.handler == None:
+            self.db_add(ip, int(port), {})
+
+        t = Thread(target=self.handler, args=(ip,int(port),))
+        t.daemon = True
+        t.run()
+
+        return "OK", 200
diff --git a/api/main.py b/api/main.py
new file mode 100644
index 0000000..8bfa760
--- /dev/null
+++ b/api/main.py
@@ -0,0 +1,53 @@
+from os import environ
+import requests as req
+from lib import *
+
+def http_handler(ip, port):
+    # if not an HTTP(S) server skip
+    if port != 80 and port != 443:
+        return api.db_add(ip, port, {})
+
+    # if its a possible HTTP(S) server send a request 
+    # and gather simple data
+    protocol = "http" if (port == 80) else "https" 
+    try:
+        res = req.get(f"{protocol}://{ip}", verify=False)
+    except:
+        return api.db_add(ip, port, {})
+
+    server = res.headers["Server"]
+    body = res.text
+
+    # api.db_add adds ip and port data to 'results' database,
+    # if ip already exists, it just appends the port 
+    # it also adds any extra information you provide with 
+    # the last argument
+    api.db_add(ip, port, {
+        "http_server": server,
+        "http_body": body,
+    })
+    # instead of 'api.db_add' you can access 
+    # the mongo driver with 'api.mongo' and directly modify
+    # the database however you like
+
+if __name__ == "__main__":
+    mongo_url = environ["API_MONGO"] if "API_MONGO" in environ else "mongodb://localhost"
+    password  = environ["API_PASSWORD"] if "API_PASSWORD" in environ else "default"
+    host      = "127.0.0.1" if "API_USE_LOCAL" in environ else "0.0.0.0"
+    port      = 5000
+
+    # creating the API
+    api = API(
+        mongo_url, # MongoDB database URL
+        password,  # API password 
+        host,      # Address to listen on
+        port,      # Port to listen on
+    )
+
+    # use our custom HTTP handler
+    # if no hanlder is set, API will just store IP and port info 
+    # on the 'results' database
+    api.set_handler(http_handler)
+
+    # start the API
+    api.run()
diff --git a/api/requirements.txt b/api/requirements.txt
new file mode 100644
index 0000000..8587583
--- /dev/null
+++ b/api/requirements.txt
@@ -0,0 +1,3 @@
+Flask
+pymongo
+requests
diff --git a/assets/web.png b/assets/web.png
deleted file mode 100644
index 49341b2..0000000
Binary files a/assets/web.png and /dev/null differ
diff --git a/database/.gitignore b/database/.gitignore
deleted file mode 100644
index b2485fe..0000000
--- a/database/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-database
-data/
diff --git a/database/Dockerfile b/database/Dockerfile
deleted file mode 100644
index 50346d0..0000000
--- a/database/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM golang:1.21.6
-
-WORKDIR /app
-COPY *.mod  ./
-COPY *.sum  ./
-COPY *.go   ./
-COPY lib    ./lib
-COPY static ./static
-
-EXPOSE 3231
-RUN go build .
-
-ENTRYPOINT ["/app/database"]
diff --git a/database/go.mod b/database/go.mod
deleted file mode 100644
index 306a4e2..0000000
--- a/database/go.mod
+++ /dev/null
@@ -1,18 +0,0 @@
-module github.com/ngn13/massacr/database
-
-go 1.21.6
-
-require (
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/gofiber/fiber/v2 v2.52.0 // indirect
-	github.com/google/uuid v1.5.0 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.51.0 // indirect
-	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-)
diff --git a/database/go.sum b/database/go.sum
deleted file mode 100644
index caafe41..0000000
--- a/database/go.sum
+++ /dev/null
@@ -1,27 +0,0 @@
-github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/gofiber/fiber/v2 v2.52.0 h1:S+qXi7y+/Pgvqq4DrSmREGiFwtB7Bu6+QFLuIHYw/UE=
-github.com/gofiber/fiber/v2 v2.52.0/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
-github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA=
-github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g=
-github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
-github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/database/lib/db.go b/database/lib/db.go
deleted file mode 100644
index fe694b3..0000000
--- a/database/lib/db.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package lib 
-
-import (
-	"encoding/json"
-	"log"
-	"os"
-	"strconv"
-	"time"
-)
-
-type Entry struct {
-  IP    string  `json:"ip"`
-  Ports []int   `json:"ports"`
-}
-
-type Data struct {
-  Entries []Entry   `json:"entries"`
-}
-
-var Db Data
-var save_tick = time.NewTicker(Interval())
-
-func SaveLoop() {
-  for {
-    select {
-      case <- save_tick.C:
-        Save()
-    }
-  }
-}
-
-func Interval() time.Duration {
-  secs, err := strconv.Atoi(os.Getenv("INTERVAL"))
-  if err != nil || secs <= 0 {
-    return 30*time.Second
-  }
-
-  return time.Duration(secs)*time.Second
-}
-
-func Save() bool{
-  dbstr, err := json.MarshalIndent(Db, "", "  ")
-  if err != nil {
-    log.Printf("Failed to save database: %s", err)
-    return false
-  }
-
-  err = os.Mkdir("data", os.ModePerm)
-  if err != nil && !os.IsExist(err) {
-    log.Printf("Cannot create the data directory")
-    return false
-  }
-
-  err = os.WriteFile("data/data.json", dbstr, 0666)
-  if err != nil {
-    log.Printf("Failed to save database: %s", err)
-    return false
-  }
-
-  return true
-}
-
-func Load() bool {
-  dbstr, err := os.ReadFile("data/data.json")
-  if os.IsNotExist(err) {
-    Db = Data{}
-    return true 
-  }
-
-  err = json.Unmarshal(dbstr, &Db)
-  if err != nil {
-    log.Printf("Failed to load database: %s", err)
-    return false
-  }
-
-  return true
-}
-
-func CheckPort(en Entry, port int) bool{
-  for _, p := range en.Ports {
-    if port == p {
-      return true
-    }
-  }
-
-  return false
-}
diff --git a/database/lib/routes.go b/database/lib/routes.go
deleted file mode 100644
index 996caa8..0000000
--- a/database/lib/routes.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package lib
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-var Password string
-
-func Auth(c *fiber.Ctx) error {
-  if(c.Query("pass")!=Password){
-    return c.Status(403).SendString("Bad password")
-  }
-
-  return c.Next()
-}
-
-func GETCheck(c *fiber.Ctx) error {
-  return c.SendString("All good")
-}
-
-func GETSearch(c *fiber.Ctx) error {
-  port, err := strconv.Atoi(c.Query("port"))
-  if err != nil {
-    port = -1
-  }
-  ip := c.Query("ip")
-
-  results := []Entry{}
-  for _, e := range Db.Entries {
-    if ip != "" && e.IP != ip {
-      continue
-    }
-
-    if port > 0 && !CheckPort(e, port){
-      continue
-    }
-
-    results = append(results, e)
-  }
-
-  return c.JSON(results)
-}
-
-func GETAdd(c *fiber.Ctx) error {
-  rip := c.Query("ip")
-  rport, err := strconv.Atoi(c.Query("port"))
-
-  if err != nil || rip == "" || rport <= 0 {
-    return c.Status(400).SendString("Bad request")
-  }
-
-  for i, e := range Db.Entries {
-    if e.IP != rip {
-      continue
-    }
-
-    if(CheckPort(e, rport)){
-      return c.Status(200).SendString("Already exists")
-    }
-
-    Db.Entries[i].Ports = append(e.Ports, rport)
-    return c.Status(200).SendString("Added port to existing IP")
-  }
-
-
-  Db.Entries = append(Db.Entries, Entry{
-    IP: strings.Clone(rip),
-    Ports: []int{rport},
-  })
-  
-  return c.Status(200).SendString("Added new IP")
-}
-
diff --git a/database/main.go b/database/main.go
deleted file mode 100644
index 57ba10e..0000000
--- a/database/main.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/middleware/cors"
-	"github.com/ngn13/massacr/database/lib"
-)
-
-func main(){
-  app := fiber.New(fiber.Config{
-    DisableStartupMessage: true,
-  })
-
-  if(!lib.Load()){
-    return
-  }
-
-  app.Static("/", "static")
-  app.Use(cors.New(cors.Config{
-    AllowOrigins: "*",
-    AllowHeaders: "*",
-    AllowMethods: "GET",
-  }))
-  app.Use(lib.Auth)
-  app.Get("/search", lib.GETSearch)
-  app.Get("/check", lib.GETCheck)
-  app.Get("/add", lib.GETAdd)
-
-  log.Println("Starting interval based save loop")
-  go lib.SaveLoop()
-
-  lib.Password = os.Getenv("PASSWORD")
-  if "" == lib.Password {
-    lib.Password = "default"
-  }
-
-  port := os.Getenv("PORT")
-  if "" == port {
-    port = ":3231"
-  }
-
-  log.Printf("Starting the database on %s", port)
-  log.Fatal(app.Listen(port))
-}
diff --git a/database/static/index.css b/database/static/index.css
deleted file mode 100644
index 365330e..0000000
--- a/database/static/index.css
+++ /dev/null
@@ -1,117 +0,0 @@
-:root {
-  --black: #000;
-  --gray: #AAA;
-  --red: #FF2020;
-}
-
-* {
-  margin: 0;
-  padding: 0;
-  font-family: monospace;
-}
-
-a {
-  color: var(--red);
-  text-decoration: none;
-}
-
-body {
-  color: var(--red);
-  background-color: var(--black);
-  flex-direction: column;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100vh;
-}
-
-main {
-  display: flex;
-  flex-direction: row;
-  gap: 40px;
-  justify-content: space-between;
-}
-
-h1 {
-  text-align: center;
-  font-size: 50px;
-  margin-bottom: 20px;
-  text-shadow: 20px 7px 5px rgba(80,0,0,0.3), 
-    20px -4px 10px rgba(255,0,0,0.3);
-}
-
-form {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 10px;
-}
-
-input {
-  padding: 10px;
-  font-size: 20px;
-  border: 2px solid var(--gray);
-  border-radius: 5px;
-  color: var(--gray);
-  background: none;
-  width: 100%;
-  transition: border-color 0.3s ease;
-  outline: none;
-}
-
-input:focus {
-  border-color: var(--red);
-  color: var(--red);
-}
-
-button {
-  padding: 12px 20px;
-  background-color: #dc3545;
-  color: #fff;
-  border: none;
-  border-radius: 5px;
-  cursor: pointer;
-  font-size: 1em;
-  transition: background-color 0.3s ease;
-}
-
-#results {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  height: 500px;
-  width: 550px;
-  padding: 20;
-  overflow-y: scroll;
-  border-left: 1px solid var(--red);
-  padding: 0 20px 0 20px;
-  overflow-x: hidden;
-}
-
-.res {
-  padding: 20px;
-  border-radius: 5px;
-  width: 500px;
-  border: 2px solid var(--gray);
-}
-
-.res h3 {
-  color: var(--red);
-  font-size: 30px;
-  margin-bottom: 10px;
-}
-
-.ports {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-
-.port {
-  padding: 6px 10px;
-  background-color: var(--red);
-  color: var(--black);
-  border-radius: 3px;
-  font-size: 20px;
-}
diff --git a/database/static/index.html b/database/static/index.html
deleted file mode 100644
index bedccc2..0000000
--- a/database/static/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="index.css" rel="stylesheet">
-    <title>🩸 massacr database search</title>
-  </head>
-  <body>
-    <main>
-      <div class="inputs">
-        <a href="https://github.com/ngn13/massacr"><h1>./massacr</h1></a>
-        <form id="form">
-          <input type="text" id="ip" placeholder="Enter IP">
-          <input type="text" id="port" placeholder="Enter Port">
-          <button type="submit" style="display: none">
-        </form>
-      </div>
-      <div id="results"></div>
-    </main>
-    <script src="index.js"></script>
-  </body>
-</html>
diff --git a/database/static/index.js b/database/static/index.js
deleted file mode 100644
index dd3201e..0000000
--- a/database/static/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function getPassword() {
-  let password = localStorage.getItem("password")
-
-  if (!password) {
-    password = prompt("Enter password:")
-    localStorage.setItem("password", password)
-  }
-
-  return password
-}
-
-function displayResults(data) {
-  const resdiv = document.getElementById("results")
-  resdiv.innerHTML = ""
-
-  data.forEach(result => {
-    const res = document.createElement("div")
-    res.classList.add("res")
-
-    const ip = document.createElement("h3")
-    ip.textContent = `${result.ip}`
-    res.appendChild(ip)
-
-    const ports = document.createElement("div")
-    ports.classList.add("ports")
-
-    result.ports.forEach(port => {
-      const portel = document.createElement("div")
-      portel.classList.add("port")
-      portel.textContent = port
-      ports.appendChild(portel)
-    })
-
-    res.appendChild(ports)
-    resdiv.appendChild(res)
-  })
-}
-
-const form = document.getElementById("form")
-form.addEventListener("submit", async(e)=>{
-  e.preventDefault()
-  const ip = document.getElementById("ip").value
-  const port = document.getElementById("port").value
-  const password = getPassword()
- 
-  const res = await fetch(`/search?pass=${password}&ip=${ip}&port=${port}`)
-  if (!res.ok) {
-    alert("Incorrect password!");
-    localStorage.removeItem("password")
-  }
- 
-  const data = await res.json()
-  displayResults(data)
-})
diff --git a/scanner/.clang-format b/scanner/.clang-format
new file mode 100644
index 0000000..0822db5
--- /dev/null
+++ b/scanner/.clang-format
@@ -0,0 +1,225 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignEscapedNewlines: Right
+AlignOperands:   Align
+AlignTrailingComments:
+  Kind:            Always
+  OverEmptyLines:  0
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterExternBlock: false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAfterAttributes: Never
+BreakAfterJavaFieldAnnotations: false
+BreakArrays:     true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentRequiresClause: true
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertNewlineAtEOF: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+PPIndentWidth:   -1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments:  true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+...
+
diff --git a/scanner/Dockerfile b/scanner/Dockerfile
index 9f36ec8..af92215 100644
--- a/scanner/Dockerfile
+++ b/scanner/Dockerfile
@@ -1,9 +1,8 @@
 FROM alpine
 
-RUN apk update && apk upgrade
 RUN apk add --no-cache build-base libnet curl libnet-dev curl-dev
 
-WORKDIR /app
+WORKDIR /scanner
 
 COPY *.c      ./
 COPY Makefile ./
@@ -12,4 +11,4 @@ COPY util     ./util
 
 RUN make
 
-ENTRYPOINT ["/app/massacr"] 
+ENTRYPOINT ["/scanner/massacr"] 
diff --git a/scanner/Makefile b/scanner/Makefile
index 4bd8752..a83ab1b 100644
--- a/scanner/Makefile
+++ b/scanner/Makefile
@@ -12,4 +12,7 @@ install:
 uninstall:
 	rm -v $(DESTDIR)$(prefix)/bin/massacr
 
-.PHONY: install uninstall
+format:
+	clang-format -i -style=file ./*.c ./*/*.c ./*/*.h
+
+.PHONY: install uninstall format
diff --git a/scanner/inc/api.h b/scanner/inc/api.h
new file mode 100644
index 0000000..0ea1a1c
--- /dev/null
+++ b/scanner/inc/api.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "../inc/log.h"
+#include <stdbool.h>
+
+typedef struct APIArgs {
+  char *ip;
+  int port;
+} api_args_t;
+
+bool api_check();
+bool api_add(void *);
diff --git a/scanner/inc/db.h b/scanner/inc/db.h
deleted file mode 100644
index 9d5347a..0000000
--- a/scanner/inc/db.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once 
-#include <stdbool.h>
-#include <curl/curl.h>
-#include "../inc/log.h"
-
-struct Entry {
-  char* ip;
-  int port;
-};
-
-bool check_db(char*, char*);
-bool add_entry(void* entry);
diff --git a/scanner/inc/log.h b/scanner/inc/log.h
index c71915f..e9ef387 100644
--- a/scanner/inc/log.h
+++ b/scanner/inc/log.h
@@ -1,19 +1,19 @@
 #pragma once
-#include <time.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
+#include <time.h>
 
 #include "../inc/op.h"
 
-#define RED     "\x1b[31m"
-#define BOLD    "\x1b[1m"
-#define BLUE    "\x1b[34m"
-#define GRAY    "\x1b[37m"
-#define RESET   "\x1b[0m"
-#define GREEN   "\x1b[32m"
-#define SPACE   "                      "
+#define RED "\x1b[31m"
+#define BOLD "\x1b[1m"
+#define BLUE "\x1b[34m"
+#define GRAY "\x1b[37m"
+#define RESET "\x1b[0m"
+#define GREEN "\x1b[32m"
+#define SPACE "                      "
 
-void info(const char*, ...);
-void error(const char*, ...);
-void debug(const char*, ...);
+void info(const char *, ...);
+void error(const char *, ...);
+void debug(const char *, ...);
diff --git a/scanner/inc/net.h b/scanner/inc/net.h
index aaccfac..751e1bc 100644
--- a/scanner/inc/net.h
+++ b/scanner/inc/net.h
@@ -1,84 +1,74 @@
 #pragma once
 #include <netinet/tcp.h>
-#include <netinet/ip.h>
-#include <pthread.h>
 #include <stdbool.h>
-#include <stdlib.h>
-#include <libnet.h>
-
-#include "../inc/log.h"
-#include "../inc/db.h"
+#include <stdint.h>
 
 struct tcphdr_ {
-    __extension__ union
-    {
-      struct
-      {
-	uint16_t th_sport;	/* source port */
-	uint16_t th_dport;	/* destination port */
-	tcp_seq th_seq;		/* sequence number */
-	tcp_seq th_ack;		/* acknowledgement number */
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-	uint8_t th_x2:4;	/* (unused) */
-	uint8_t th_off:4;	/* data offset */
-# endif
-# if __BYTE_ORDER == __BIG_ENDIAN
-	uint8_t th_off:4;	/* data offset */
-	uint8_t th_x2:4;	/* (unused) */
-# endif
-	uint8_t th_flags;
-# define TH_FIN	0x01
-# define TH_SYN	0x02
-# define TH_RST	0x04
-# define TH_PUSH	0x08
-# define TH_ACK	0x10
-# define TH_URG	0x20
-	uint16_t th_win;	/* window */
-	uint16_t th_sum;	/* checksum */
-	uint16_t th_urp;	/* urgent pointer */
-      };
-      struct
-      {
-	uint16_t source;
-	uint16_t dest;
-	uint32_t seq;
-	uint32_t ack_seq;
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-	uint16_t res1:4;
-	uint16_t doff:4;
-	uint16_t fin:1;
-	uint16_t syn:1;
-	uint16_t rst:1;
-	uint16_t psh:1;
-	uint16_t ack:1;
-	uint16_t urg:1;
-	uint16_t res2:2;
-# elif __BYTE_ORDER == __BIG_ENDIAN
-	uint16_t doff:4;
-	uint16_t res1:4;
-	uint16_t res2:2;
-	uint16_t urg:1;
-	uint16_t ack:1;
-	uint16_t psh:1;
-	uint16_t rst:1;
-	uint16_t syn:1;
-	uint16_t fin:1;
-# else
-#  error "Adjust your <bits/endian.h> defines"
-# endif
-	uint16_t window;
-	uint16_t check;
-	uint16_t urg_ptr;
-      };
+  __extension__ union {
+    struct {
+      uint16_t th_sport; /* source port */
+      uint16_t th_dport; /* destination port */
+      tcp_seq th_seq;    /* sequence number */
+      tcp_seq th_ack;    /* acknowledgement number */
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+      uint8_t th_x2 : 4;  /* (unused) */
+      uint8_t th_off : 4; /* data offset */
+#endif
+#if __BYTE_ORDER == __BIG_ENDIAN
+      uint8_t th_off : 4; /* data offset */
+      uint8_t th_x2 : 4;  /* (unused) */
+#endif
+      uint8_t th_flags;
+#define TH_FIN 0x01
+#define TH_SYN 0x02
+#define TH_RST 0x04
+#define TH_PUSH 0x08
+#define TH_ACK 0x10
+#define TH_URG 0x20
+      uint16_t th_win; /* window */
+      uint16_t th_sum; /* checksum */
+      uint16_t th_urp; /* urgent pointer */
+    };
+    struct {
+      uint16_t source;
+      uint16_t dest;
+      uint32_t seq;
+      uint32_t ack_seq;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+      uint16_t res1 : 4;
+      uint16_t doff : 4;
+      uint16_t fin : 1;
+      uint16_t syn : 1;
+      uint16_t rst : 1;
+      uint16_t psh : 1;
+      uint16_t ack : 1;
+      uint16_t urg : 1;
+      uint16_t res2 : 2;
+#elif __BYTE_ORDER == __BIG_ENDIAN
+      uint16_t doff : 4;
+      uint16_t res1 : 4;
+      uint16_t res2 : 2;
+      uint16_t urg : 1;
+      uint16_t ack : 1;
+      uint16_t psh : 1;
+      uint16_t rst : 1;
+      uint16_t syn : 1;
+      uint16_t fin : 1;
+#else
+#error "Adjust your <bits/endian.h> defines"
+#endif
+      uint16_t window;
+      uint16_t check;
+      uint16_t urg_ptr;
     };
+  };
 };
 
-
-struct ThreadArgs {
+typedef struct RecvArgs {
   uint16_t port;
   bool should_run;
-};
+} recv_args_t;
 
-extern pthread_mutex_t lock;
-bool receive(struct ThreadArgs*);
-bool syn(char*, int, int);
+extern pthread_mutex_t net_lock;
+bool net_syn(char *, int, int);
+bool net_receive(void *);
diff --git a/scanner/inc/op.h b/scanner/inc/op.h
index 071e1fb..52ba4b7 100644
--- a/scanner/inc/op.h
+++ b/scanner/inc/op.h
@@ -1,8 +1,5 @@
 #pragma once
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
-#include <stdint.h>
 #include <stdbool.h>
 
 #include "../inc/log.h"
@@ -14,16 +11,16 @@
 #define TYPE_INT 3
 
 struct Option {
-  char* value;
-  char* name;
-  char* desc;
+  char *value;
+  char *name;
+  char *desc;
   int type;
 };
 
 extern struct Option options[];
-char* extract_value(char*);
-bool parse_opt(char*);
-bool get_bool(char*);
-char* get_str(char*);
-int get_int(char*);
+char *extract_value(char *);
+bool parse_opt(char *);
+bool get_bool(char *);
+char *get_str(char *);
+int get_int(char *);
 void print_opts();
diff --git a/scanner/inc/pool.h b/scanner/inc/pool.h
new file mode 100644
index 0000000..a1e11fd
--- /dev/null
+++ b/scanner/inc/pool.h
@@ -0,0 +1,28 @@
+#pragma once
+#include <pthread.h>
+#include <stdbool.h>
+
+typedef void (*func_t)(void *arg);
+typedef struct work_t {
+  func_t func;
+  void *arg;
+  struct work_t *next;
+} work_t;
+
+typedef struct pool_t {
+  pthread_mutex_t mutex;
+
+  pthread_cond_t work_lock;
+  pthread_cond_t thread_lock;
+
+  size_t active;
+  size_t all;
+
+  work_t *first;
+  work_t *last;
+  bool stop;
+} pool_t;
+
+pool_t *pool_init(int);
+bool pool_add(pool_t *, func_t, void *);
+void pool_stop(pool_t *);
diff --git a/scanner/inc/util.h b/scanner/inc/util.h
index 2e6255d..3faa8d2 100644
--- a/scanner/inc/util.h
+++ b/scanner/inc/util.h
@@ -1,25 +1,23 @@
 #pragma once
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 #define contains(str, sub) (strchr(str, sub) != NULL)
 #define startswith(str, sub) (strncmp(str, sub, strlen(sub)) == 0)
-#define neq(s1, s2) (strcmp(s1, s2)!=0)
-#define eq(s1, s2) (strcmp(s1, s2)==0)
+#define neq(s1, s2) (strcmp(s1, s2) != 0)
+#define eq(s1, s2) (strcmp(s1, s2) == 0)
 
-struct Range {
+typedef struct Range {
   uint8_t ip[4];
   uint8_t net;
-};
+} range_t;
 
-int* parse_ports(char*, int*);
-void clean_ports(int*);
+int *parse_ports(char *, int *);
+void clean_ports(int *);
 
-bool get_range(struct Range*, char*);
-bool skip_range(struct Range*, uint8_t*);
+bool get_range(range_t *, char *);
+bool skip_range(range_t *, uint8_t *);
+void urljoin(char *, char *, char *);
 extern int common_ports[];
-extern char* bad_ranges[];
+extern char *bad_ranges[];
 extern int bad_range_size;
diff --git a/scanner/main.c b/scanner/main.c
index 730aa39..a09bf9f 100644
--- a/scanner/main.c
+++ b/scanner/main.c
@@ -1,7 +1,7 @@
 /*
 
- *  massacr | mass internet/ipv4 scanner
- *  ======================================
+ *  massacr/scanner | mass internet/ipv4 scanner
+ *  ============================================
  *  written by ngn (https://ngn.tf) (2024)
 
  *  This program is free software: you can redistribute it and/or modify
@@ -13,58 +13,57 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- 
+
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
 
 #include <pthread.h>
+#include <signal.h>
 #include <stdint.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
-#include "inc/op.h"
-#include "inc/db.h"
-#include "inc/net.h"
+#include "inc/api.h"
 #include "inc/log.h"
+#include "inc/net.h"
+#include "inc/op.h"
 #include "inc/util.h"
 
-struct ThreadArgs* args = NULL; 
-int ports_size;
-int recvport;
-int* ports;
+recv_args_t *args = NULL;
+int ports_size, recvport, *ports;
 
-void handle_int(){
+void handle_int() {
   info("Got interrupt, give me a second for cleanup");
 
-  if(NULL != args){
-    pthread_mutex_lock(&lock);
+  if (NULL != args) {
+    pthread_mutex_lock(&net_lock);
     args->should_run = false;
-    pthread_mutex_unlock(&lock);
+    pthread_mutex_unlock(&net_lock);
   }
 
   exit(1);
 }
 
-bool scan(char *ipstr){
-  for(int i = 0; i < ports_size; i++){
+bool scan(char *ipstr) {
+  for (int i = 0; i < ports_size; i++) {
     int cur = ports[i];
 
-    if(!syn(ipstr, cur, recvport)){
+    if (!net_syn(ipstr, cur, recvport)) {
       error("Failed to send SYN to %s:%d", ipstr, ports[i]);
       return false;
-    }  
+    }
   }
 
   return true;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char **argv) {
   // parse options and log them out
-  for(int i = 1; i < argc; i++){
-    if(!parse_opt(argv[i])){
+  for (int i = 1; i < argc; i++) {
+    if (!parse_opt(argv[i])) {
       return EXIT_FAILURE;
     }
   }
@@ -74,36 +73,34 @@ int main(int argc, char** argv) {
   print_opts();
 
   // check if running as root
-  if(0!=getuid()){
+  if (0 != getuid()) {
     error("Cannot create raw sockets without root");
     return EXIT_FAILURE;
   }
 
   // init threading and other stuff
   signal(SIGINT, handle_int);
-  if(!check_db(get_str("url"), get_str("pwd")))
+  if (!api_check())
     return EXIT_FAILURE;
 
   ports = parse_ports(get_str("ports"), &ports_size);
-  if(ports == NULL)
+  if (ports == NULL)
     return EXIT_FAILURE;
-  if(ports_size > 1)
+  if (ports_size > 1)
     info("Scanning for %d ports", ports_size);
   else
     info("Scanning for 1 port", ports_size);
   recvport = get_int("recvport");
 
   // converts string non public IP ranges to Range struct
-  struct Range* ranges = NULL;
-  for(int i = 0; i < bad_range_size; i++){
-    if(ranges == NULL)
+  struct Range *ranges = NULL;
+  for (int i = 0; i < bad_range_size; i++) {
+    if (ranges == NULL)
       ranges = malloc(sizeof(struct Range));
     else
-      ranges = realloc(ranges, 
-          sizeof(struct Range)*(i+1));
-
+      ranges = realloc(ranges, sizeof(struct Range) * (i + 1));
 
-    if(!get_range(&ranges[i], bad_ranges[i])){
+    if (!get_range(&ranges[i], bad_ranges[i])) {
       error("Invalid range: %s", bad_ranges[i]);
       goto FAIL;
     }
@@ -111,71 +108,75 @@ int main(int argc, char** argv) {
 
   // start receiver thread
   pthread_t recv;
-  args = malloc(sizeof(struct ThreadArgs));
+  args = malloc(sizeof(recv_args_t));
   args->should_run = true;
   args->port = recvport;
 
-  pthread_create(&recv, NULL, 
-      (void*)receive, args);
+  pthread_mutex_init(&net_lock, NULL);
+  pthread_create(&recv, NULL, (void *)net_receive, args);
   pthread_detach(recv);
 
   // calculating limits
-  float limit = 1.0/get_int("limit");
-  limit = (limit)*1000000;
+  float limit = 1.0 / get_int("limit");
+  limit = (limit) * 1000000;
 
   // loops over all the IPs
-  uint8_t cur[4] = {1,1,1,0};
-  while(cur[0] <= 255){
-  while(cur[1] <= 255){
-  while(cur[2] <= 255){
-  while(cur[3] <= 255){
-    if(skip_range(ranges, cur))
-      goto NEXT;
-
-    char ipstr[16];
-    sprintf(ipstr, "%d.%d.%d.%d", 
-        cur[0], cur[1], cur[2], cur[3]);
-
-    scan(ipstr);
-    usleep(limit);
-  NEXT:
-    if(cur[3] == 255){
-      cur[3] = 0; break;
-    }
-    cur[3]++;
-  }
-    if(cur[2] == 255){
-      cur[2] = 0; break;
+  uint8_t cur[4] = {1, 1, 1, 0};
+  while (cur[0] <= 255) {
+    while (cur[1] <= 255) {
+      while (cur[2] <= 255) {
+        while (cur[3] <= 255) {
+          if (skip_range(ranges, cur))
+            goto NEXT;
+
+          char ipstr[16];
+          sprintf(ipstr, "%d.%d.%d.%d", cur[0], cur[1], cur[2], cur[3]);
+
+          scan(ipstr);
+          usleep(limit);
+        NEXT:
+          if (cur[3] == 255) {
+            cur[3] = 0;
+            break;
+          }
+          cur[3]++;
+        }
+        if (cur[2] == 255) {
+          cur[2] = 0;
+          break;
+        }
+        cur[2]++;
+      }
+      info("Scan completed for the %d.%d.0.0/16 range", cur[0], cur[1]);
+      if (cur[1] == 255) {
+        cur[1] = 0;
+        break;
+      }
+      cur[1]++;
     }
-    cur[2]++;
-  }
-    info("Scan completed for the %d.%d.0.0/16 range", 
-        cur[0], cur[1]);
-    if(cur[1] == 255){
-      cur[1] = 0; break;
-    }
-    cur[1]++;
-  }
-    if(cur[0] == 255) break;
+    if (cur[0] == 255)
+      break;
     cur[0]++;
   }
 
   info("Scan completed!");
   info("Now waiting for receiver timeout (%ds)", get_int("timeout"));
   sleep(get_int("timeout"));
-  pthread_mutex_lock(&lock);
+  pthread_mutex_lock(&net_lock);
   args->should_run = false;
-  pthread_mutex_unlock(&lock);
-  
+  pthread_mutex_unlock(&net_lock);
+  pthread_mutex_destroy(&net_lock);
+
   free(ranges);
   clean_ports(ports);
   info("Scan completed");
   return EXIT_SUCCESS;
 
 FAIL:
-  pthread_mutex_lock(&lock);
+  pthread_mutex_lock(&net_lock);
   args->should_run = false;
-  pthread_mutex_unlock(&lock);
+  pthread_mutex_unlock(&net_lock);
+  pthread_mutex_destroy(&net_lock);
   free(ranges);
   clean_ports(ports);
   return EXIT_FAILURE;
diff --git a/scanner/util/db.c b/scanner/util/api.c
similarity index 50%
rename from scanner/util/db.c
rename to scanner/util/api.c
index 99ba7a7..e7cb0a6 100644
--- a/scanner/util/db.c
+++ b/scanner/util/api.c
@@ -1,26 +1,22 @@
-#include <stdbool.h>
-#include <curl/curl.h>
-#include "../inc/db.h"
+#include "../inc/api.h"
 #include "../inc/log.h"
 
-char* gurl;
-char* gpass;
-
-void urljoin(char* newurl, char* url, char* path) {
-  if(url[strlen(url)-1]=='/')
-    sprintf(newurl, "%s%s", url, path);
-  else
-    sprintf(newurl, "%s/%s", url, path);
-}
+#include <curl/curl.h>
+#include <stdbool.h>
+#include <string.h>
 
-bool check_db(char* url, char* pass) {
-  CURL* curl = curl_easy_init();
-  FILE* null = fopen("/dev/null", "wb");
+bool api_check() {
+  CURL *curl = curl_easy_init();
+  FILE *null = fopen("/dev/null", "wb");
   bool ret = true;
 
-  char newurl[strlen(url)+strlen(pass)+20];
-  char path[strlen(pass)+30];
-  sprintf(path, "check?pass=%s", pass);
+  char *password = get_str("password");
+  char *url = get_str("url");
+
+  char path[strlen(password) + 30];
+  sprintf(path, "scanner/check?pass=%s", password);
+
+  char newurl[strlen(url) + strlen(path) + 5];
   urljoin(newurl, url, path);
 
   curl_easy_setopt(curl, CURLOPT_URL, newurl);
@@ -30,7 +26,7 @@ bool check_db(char* url, char* pass) {
   CURLcode res = curl_easy_perform(curl);
 
   if (res != CURLE_OK) {
-    error("Database connection failed");
+    error("API connection failed");
     ret = false;
     goto DONE;
   }
@@ -38,38 +34,42 @@ bool check_db(char* url, char* pass) {
   long code;
   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
 
-  if(code == 403) {
-    error("Bad password for database");
+  if (code == 403) {
+    error("Bad password for API");
     ret = false;
     goto DONE;
   }
-    
-  if(code != 200) {
-    error("Bad status code from database (%d)", code);
+
+  if (code != 200) {
+    error("Bad status code from API (%d)", code);
     ret = false;
     goto DONE;
   }
 
-  gurl = url;
-  gpass = pass;
-
 DONE:
   curl_easy_cleanup(curl);
   fclose(null);
   return ret;
 }
 
-bool add_entry(void* args) {
-  struct Entry* en = (struct Entry*)args;
+bool api_add(void *ap) {
+  api_args_t *args = (api_args_t *)ap;
+  if (NULL == args)
+    return false;
 
-  CURL* curl = curl_easy_init();
-  FILE* null = fopen("/dev/null", "wb");
+  CURL *curl = curl_easy_init();
+  FILE *null = fopen("/dev/null", "wb");
   bool ret = true;
 
-  char newurl[strlen(gurl)+strlen(gpass)+strlen(en->ip)+50];
-  char path[strlen(gpass)+strlen(en->ip)+50];
-  sprintf(path, "add?pass=%s&ip=%s&port=%d", gpass, en->ip, en->port);
-  urljoin(newurl, gurl, path);
+  char *password = get_str("password");
+  char *url = get_str("url");
+
+  char path[strlen(password) + strlen(args->ip) + 55];
+  sprintf(path, "scanner/add?pass=%s&ip=%s&port=%d", password, args->ip,
+          args->port);
+
+  char newurl[strlen(url) + strlen(path) + 10];
+  urljoin(newurl, url, path);
 
   curl_easy_setopt(curl, CURLOPT_URL, newurl);
   curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl/massacr");
@@ -78,7 +78,7 @@ bool add_entry(void* args) {
   CURLcode res = curl_easy_perform(curl);
 
   if (res != CURLE_OK) {
-    error("Database connection failed");
+    error("API connection failed");
     ret = false;
     goto DONE;
   }
@@ -86,20 +86,20 @@ bool add_entry(void* args) {
   long code;
   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
 
-  if(code == 403) {
-    error("Bad password for database");
+  if (code == 403) {
+    error("Bad password for API");
     ret = false;
     goto DONE;
   }
-    
-  if(code != 200) {
-    error("Bad status code from database");
+
+  if (code != 200) {
+    error("Bad status code from API (%d)", code);
     ret = false;
     goto DONE;
   }
 
 DONE:
-  free(args);
+  free(ap);
   curl_easy_cleanup(curl);
   fclose(null);
   return ret;
diff --git a/scanner/util/log.c b/scanner/util/log.c
index 49929dd..e43bbd5 100644
--- a/scanner/util/log.c
+++ b/scanner/util/log.c
@@ -1,28 +1,27 @@
-#include <time.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
+#include <time.h>
 
-#include "../inc/op.h"
 #include "../inc/log.h"
+#include "../inc/op.h"
 
-void get_time(char* res){
+void get_time(char *res) {
   time_t now = time(NULL);
   struct tm tm = *localtime(&now);
 
-  sprintf(res, "%02d/%02d-%02d:%02d", 
-      tm.tm_mday, tm.tm_mon+1,
-      tm.tm_min, tm.tm_hour);
+  sprintf(res, "%02d/%02d-%02d:%02d", tm.tm_mday, tm.tm_mon + 1, tm.tm_min,
+          tm.tm_hour);
 }
 
-void info(const char* msg, ...){
+void info(const char *msg, ...) {
   va_list args;
   va_start(args, msg);
 
   char tstr[16];
   get_time(tstr);
-  
-  if(get_bool("no-color")){
+
+  if (get_bool("no-color")) {
     printf("[%s] INFO  # ", tstr);
     vprintf(msg, args);
     printf("\n");
@@ -30,20 +29,20 @@ void info(const char* msg, ...){
     return;
   }
 
-  printf(BOLD BLUE"[%s] INFO  # "RESET, tstr);
+  printf(BOLD BLUE "[%s] INFO  # " RESET, tstr);
   vprintf(msg, args);
-  printf(RESET"\n");
+  printf(RESET "\n");
   va_end(args);
 }
 
-void error(const char* msg, ...){
+void error(const char *msg, ...) {
   va_list args;
   va_start(args, msg);
 
   char tstr[16];
   get_time(tstr);
 
-  if(get_bool("no-color")){
+  if (get_bool("no-color")) {
     printf("[%s] ERROR # ", tstr);
     vprintf(msg, args);
     printf("\n");
@@ -51,24 +50,24 @@ void error(const char* msg, ...){
     return;
   }
 
-  printf(BOLD RED"[%s] ERROR # "RESET, tstr);
+  printf(BOLD RED "[%s] ERROR # " RESET, tstr);
   vprintf(msg, args);
-  printf(RESET"\n");
-  
+  printf(RESET "\n");
+
   va_end(args);
 }
 
-void debug(const char* msg, ...){
+void debug(const char *msg, ...) {
   va_list args;
   va_start(args, msg);
 
-  if(!get_bool("debug"))
+  if (!get_bool("debug"))
     return;
 
   char tstr[16];
   get_time(tstr);
 
-  if(get_bool("no-color")){
+  if (get_bool("no-color")) {
     printf("[%s] DEBUG # ", tstr);
     vprintf(msg, args);
     printf("\n");
@@ -76,9 +75,9 @@ void debug(const char* msg, ...){
     return;
   }
 
-  printf(BOLD GRAY"[%s] DEBUG # "RESET, tstr);
+  printf(BOLD GRAY "[%s] DEBUG # " RESET, tstr);
   vprintf(msg, args);
-  printf(RESET"\n");
-  
+  printf(RESET "\n");
+
   va_end(args);
 }
diff --git a/scanner/util/net.c b/scanner/util/net.c
index fd8a6a6..b080901 100644
--- a/scanner/util/net.c
+++ b/scanner/util/net.c
@@ -1,100 +1,94 @@
-#include <netinet/tcp.h>
+#include <libnet.h>
 #include <netinet/ip.h>
+#include <netinet/tcp.h>
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <libnet.h>
 
+#include "../inc/api.h"
 #include "../inc/log.h"
 #include "../inc/net.h"
-#include "../inc/db.h"
+#include "../inc/pool.h"
+
+pthread_mutex_t net_lock;
 
-pthread_mutex_t lock;
+bool net_receive(void *ap) {
+  recv_args_t *args = (recv_args_t *)ap;
+  pool_t *pool = pool_init(10);
 
-bool receive(struct ThreadArgs* args){
   int s = socket(AF_INET, SOCK_RAW, IPPROTO_TCP);
-  if(s < 0){
+  if (s < 0) {
     debug("Cannot create raw TCP socket");
     return false;
   }
 
-  struct timeval timeout;      
+  struct timeval timeout;
   struct sockaddr_in addr;
   uint addrlen = sizeof(addr);
 
-  char buff[
-    sizeof(struct tcphdr_)+sizeof(struct iphdr)
-  ] = {0}; 
+  char buff[sizeof(struct tcphdr_) + sizeof(struct iphdr)] = {0};
 
   info("Started receiver on port %d", args->port);
-  while(args->should_run){
-    int res = recvfrom(s, &buff, sizeof(buff), 0, 
-        (struct sockaddr*)&addr, &addrlen);
+  while (args->should_run) {
+    int res =
+        recvfrom(s, &buff, sizeof(buff), 0, (struct sockaddr *)&addr, &addrlen);
 
-    if(res <= 0)
+    if (res <= 0)
       continue;
-    
-    struct tcphdr_* tcph = (struct tcphdr_*)(buff+sizeof(struct iphdr));
-    if(tcph->ack != 1 || tcph->syn != 1 || tcph->rst == 1)
+
+    struct tcphdr_ *tcph = (struct tcphdr_ *)(buff + sizeof(struct iphdr));
+    if (tcph->ack != 1 || tcph->syn != 1 || tcph->rst == 1)
       continue;
-  
-    if(htons(tcph->dest) != args->port)
+
+    if (htons(tcph->dest) != args->port)
       continue;
 
     char ipstr[INET_ADDRSTRLEN];
     inet_ntop(AF_INET, &(addr.sin_addr), ipstr, INET_ADDRSTRLEN);
-  
-    pthread_t t;
-    struct Entry* en = malloc(sizeof(struct Entry));
-    en->port = htons(tcph->source);
-    en->ip = ipstr;
 
-    pthread_create(&t, NULL, (void*)add_entry, en);
-    pthread_detach(t);
+    pthread_t t;
+    api_args_t *data = malloc(sizeof(api_args_t));
+    data->port = htons(tcph->source);
+    data->ip = ipstr;
 
-    pthread_mutex_lock(&lock);
+    pool_add(pool, (void *)api_add, data);
+    pthread_mutex_lock(&net_lock);
     debug("Received SYN+ACK from %s:%d", ipstr, htons(tcph->source));
-    pthread_mutex_unlock(&lock);
+    pthread_mutex_unlock(&net_lock);
   }
 
-  pthread_mutex_lock(&lock);
+  pthread_mutex_lock(&net_lock);
   debug("Closing thread");
-  pthread_mutex_unlock(&lock);
+  pthread_mutex_unlock(&net_lock);
 
+  pool_stop(pool);
   free(args);
   close(s);
   return true;
 }
 
-bool syn(char* ipstr, int port, int recvport) {
-  char* payload = "massacr scanner IGNORE";
+bool net_syn(char *ipstr, int port, int recvport) {
+  char *payload = "massacr scanner IGNORE";
   int payload_s = strlen(payload);
 
-  libnet_t* handle = libnet_init(
-    LIBNET_RAW4, NULL, NULL);
+  libnet_t *handle = libnet_init(LIBNET_RAW4, NULL, NULL);
 
   libnet_ptag_t ret = libnet_build_tcp(
-    recvport, port,
-    0x01010101, 0x02020202,
-    TH_SYN, 32767, 0, 10,
-    LIBNET_TCP_H+payload_s,
-    (uint8_t*)payload, payload_s,
-    handle, 0);
-
-  if(ret < 0)
+      recvport, port, 0x01010101, 0x02020202, TH_SYN, 32767, 0, 10,
+      LIBNET_TCP_H + payload_s, (uint8_t *)payload, payload_s, handle, 0);
+
+  if (ret < 0)
     goto FAIL;
 
-  ret = libnet_build_ipv4(
-      LIBNET_IPV4_H+LIBNET_TCP_H+payload_s,
-      0, 242, 0, 64, IPPROTO_TCP, 0, 
-      libnet_get_ipaddr4(handle),
-      libnet_name2addr4(handle, ipstr, LIBNET_RESOLVE),
-      NULL, 0, handle, 0);
- 
-  if(ret < 0)
+  ret = libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H + payload_s, 0, 242, 0,
+                          64, IPPROTO_TCP, 0, libnet_get_ipaddr4(handle),
+                          libnet_name2addr4(handle, ipstr, LIBNET_RESOLVE),
+                          NULL, 0, handle, 0);
+
+  if (ret < 0)
     goto FAIL;
 
-  if(libnet_write(handle)<0)
+  if (libnet_write(handle) < 0)
     goto FAIL;
 
   libnet_destroy(handle);
@@ -103,5 +97,4 @@ bool syn(char* ipstr, int port, int recvport) {
 FAIL:
   libnet_destroy(handle);
   return false;
- 
 }
diff --git a/scanner/util/op.c b/scanner/util/op.c
index 0ff9989..4d352eb 100644
--- a/scanner/util/op.c
+++ b/scanner/util/op.c
@@ -1,83 +1,108 @@
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
-#include "../inc/op.h"
 #include "../inc/log.h"
+#include "../inc/op.h"
 #include "../inc/util.h"
 
 struct Option options[] = {
-  {.name="no-color",    .type=TYPE_BOOL,    .value="false",                   .desc="Do not print colored output"},
-  {.name="recvport",    .type=TYPE_INT,     .value="13421",                   .desc="Source port for TCP packets"},
-  {.name="timeout",     .type=TYPE_INT,     .value="10",                      .desc="Timeout for receiver thread"},
-  {.name="ports",       .type=TYPE_STR,     .value="common",                  .desc="Ports to scan for"},
-  {.name="limit",       .type=TYPE_INT,     .value="20",                      .desc="Packets per second limit"},
-  {.name="debug",       .type=TYPE_BOOL,    .value="false",                   .desc="Enable debug output"},
-  {.name="url",         .type=TYPE_STR,     .value="http://localhost:3231",   .desc="Database HTTP(S) URL"},
-  {.name="pwd",         .type=TYPE_STR,     .value="default",                 .desc="Database password"},
+    {.name = "no-color",
+     .type = TYPE_BOOL,
+     .value = "false",
+     .desc = "Do not print colored output"},
+    {.name = "recvport",
+     .type = TYPE_INT,
+     .value = "13421",
+     .desc = "Source port for TCP packets"},
+    {.name = "timeout",
+     .type = TYPE_INT,
+     .value = "10",
+     .desc = "Timeout for receiver thread"},
+    {.name = "ports",
+     .type = TYPE_STR,
+     .value = "common",
+     .desc = "Ports to scan for"},
+    {.name = "limit",
+     .type = TYPE_INT,
+     .value = "20",
+     .desc = "Packets per second limit"},
+    {.name = "debug",
+     .type = TYPE_BOOL,
+     .value = "false",
+     .desc = "Enable debug output"},
+    {.name = "url",
+     .type = TYPE_STR,
+     .value = "http://localhost:5000",
+     .desc = "API HTTP(S) URL"},
+    {.name = "password",
+     .type = TYPE_STR,
+     .value = "default",
+     .desc = "API password"},
 };
 
-char* extract_value(char* o) {
-  char* value = strtok(o, "=");
-  if(NULL == value) return NULL;
-  
+char *extract_value(char *o) {
+  char *value = strtok(o, "=");
+  if (NULL == value)
+    return NULL;
+
   value = strtok(NULL, "=");
-  if(NULL == value) return NULL;
+  if (NULL == value)
+    return NULL;
 
   return value;
 }
 
-void print_opts(){
+void print_opts() {
   int max_len = 0;
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    if(max_len < strlen(options[i].name))
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    if (max_len < strlen(options[i].name))
       max_len = strlen(options[i].name);
   }
 
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    char spacebuf[(max_len-strlen(options[i].name))+2];
-    for(int i = 0; i < sizeof(spacebuf); i++)
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    char spacebuf[(max_len - strlen(options[i].name)) + 2];
+    for (int i = 0; i < sizeof(spacebuf); i++)
       spacebuf[i] = ' ';
-    spacebuf[sizeof(spacebuf)-1] = '\0';
+    spacebuf[sizeof(spacebuf) - 1] = '\0';
 
-    if(get_bool("no-color")){
-      printf(SPACE"%s%s=> %s\n", 
-          options[i].name, spacebuf, options[i].value);
+    if (get_bool("no-color")) {
+      printf(SPACE "%s%s=> %s\n", options[i].name, spacebuf, options[i].value);
       continue;
     }
 
-    if(options[i].type == TYPE_BOOL)
-      printf(SPACE BOLD"%s"RESET"%s=> %s\n"RESET, 
-          options[i].name, spacebuf, get_bool(options[i].name) ? GREEN"true" : RED"false");
+    if (options[i].type == TYPE_BOOL)
+      printf(SPACE BOLD "%s" RESET "%s=> %s\n" RESET, options[i].name, spacebuf,
+             get_bool(options[i].name) ? GREEN "true" : RED "false");
     else
-      printf(SPACE BOLD"%s"RESET"%s=> %s\n"RESET, 
-          options[i].name, spacebuf, options[i].value);
+      printf(SPACE BOLD "%s" RESET "%s=> %s\n" RESET, options[i].name, spacebuf,
+             options[i].value);
   }
 }
 
-int get_int(char* name) {
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    if(eq(options[i].name, name))
+int get_int(char *name) {
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    if (eq(options[i].name, name))
       return atoi(options[i].value);
   }
 
   return -1;
 }
 
-bool get_bool(char* name){
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    if(eq(options[i].name, name))
+bool get_bool(char *name) {
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    if (eq(options[i].name, name))
       return eq(options[i].value, "true");
   }
-  
+
   return false;
 }
 
-char* get_str(char* name) {
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    if(eq(options[i].name, name))
+char *get_str(char *name) {
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    if (eq(options[i].name, name))
       return options[i].value;
   }
 
@@ -87,88 +112,97 @@ char* get_str(char* name) {
 void print_help() {
   info("massacr scanner %s: https://github.com/ngn13/massacr", VERSION);
   info("Listing available options:");
-  
+
   int max_len = 0;
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    if(max_len < strlen(options[i].name))
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    if (max_len < strlen(options[i].name))
       max_len = strlen(options[i].name);
   }
 
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    char spacebuf[(max_len-strlen(options[i].name))+2];
-    for(int i = 0; i < sizeof(spacebuf); i++)
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    char spacebuf[(max_len - strlen(options[i].name)) + 2];
+    for (int i = 0; i < sizeof(spacebuf); i++)
       spacebuf[i] = ' ';
-    spacebuf[sizeof(spacebuf)-1] = '\0';
+    spacebuf[sizeof(spacebuf) - 1] = '\0';
 
-    if(get_bool("no-color")){
-      printf(SPACE"--%s%s=> %s\n", 
-          options[i].name, spacebuf, options[i].value);
+    if (get_bool("no-color")) {
+      printf(SPACE "--%s%s=> %s\n", options[i].name, spacebuf,
+             options[i].value);
       continue;
     }
-      
-    printf(SPACE BOLD"--%s"RESET"%s=> %s\n"RESET, 
-        options[i].name, spacebuf, options[i].desc);
+
+    printf(SPACE BOLD "--%s" RESET "%s=> %s\n" RESET, options[i].name, spacebuf,
+           options[i].desc);
   }
 
-  info("Example: "BOLD"massacr --no-color --recvport=1234 --limit=200 --ports=80,443"RESET);
+  info("Example: " BOLD
+       "massacr --no-color --recvport=1234 --limit=200 --ports=80,443" RESET);
   info("For more examples and details checkout the README");
 
   printf("\n");
   info("This program is free software: you can redistribute it and/or modify");
-  printf(SPACE"it under the terms of the GNU General Public License as published by\n");
-  printf(SPACE"the Free Software Foundation, either version 3 of the License, or\n");
-  printf(SPACE"(at your option) any later version.\n");
+  printf(
+      SPACE
+      "it under the terms of the GNU General Public License as published by\n");
+  printf(SPACE
+         "the Free Software Foundation, either version 3 of the License, or\n");
+  printf(SPACE "(at your option) any later version.\n");
   printf("\n");
-  printf(SPACE"This program is distributed in the hope that it will be useful\n");
-  printf(SPACE"but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-  printf(SPACE"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
-  printf(SPACE"GNU General Public License for more details.\n");
+  printf(SPACE
+         "This program is distributed in the hope that it will be useful\n");
+  printf(SPACE
+         "but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+  printf(SPACE
+         "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+  printf(SPACE "GNU General Public License for more details.\n");
   printf("\n");
-  printf(SPACE"You should have received a copy of the GNU General Public License\n");
-  printf(SPACE"along with this program.  If not, see <https://www.gnu.org/licenses/>.\n");
+  printf(SPACE
+         "You should have received a copy of the GNU General Public License\n");
+  printf(SPACE "along with this program.  If not, see "
+               "<https://www.gnu.org/licenses/>.\n");
 }
 
-bool parse_opt(char* o) {
-  if(eq(o, "--help") || eq(o, "--h")){
+bool parse_opt(char *o) {
+  if (eq(o, "--help") || eq(o, "--h")) {
     print_help();
     exit(EXIT_SUCCESS);
   }
 
-  for(int i = 0; i < sizeof(options)/sizeof(struct Option); i++){
-    char fullop[strlen(options[i].name)+5];
+  for (int i = 0; i < sizeof(options) / sizeof(struct Option); i++) {
+    char fullop[strlen(options[i].name) + 5];
     sprintf(fullop, "--%s", options[i].name);
-    if(!startswith(o, fullop))
+    if (!startswith(o, fullop))
       continue;
 
     switch (options[i].type) {
-      case TYPE_BOOL:
-        if(neq(o, fullop))
-          goto UNKNOWN;
-        options[i].value = "true";
-        return true;
-        break;
-      case TYPE_STR:
-        options[i].value = extract_value(o);
-        if(NULL == options[i].value){
-          error("Value not specified for the option: %s", options[i].name);
-          return false;
-        }
-        return true;
-        break;
-      case TYPE_INT:
-        options[i].value = extract_value(o);
-        if(NULL == options[i].value){
-          error("Value not specified for the option: %s", options[i].name);
-          return false;
-        }
-
-        if(atoi(options[i].value)<=0){
-          error("Bad value for option: %s", options[i].name);
-          return false;
-        }
-
-        return true;
-        break;
+    case TYPE_BOOL:
+      if (neq(o, fullop))
+        goto UNKNOWN;
+      options[i].value = "true";
+      return true;
+      break;
+    case TYPE_STR:
+      options[i].value = extract_value(o);
+      if (NULL == options[i].value) {
+        error("Value not specified for the option: %s", options[i].name);
+        return false;
+      }
+      return true;
+      break;
+    case TYPE_INT:
+      options[i].value = extract_value(o);
+      if (NULL == options[i].value) {
+        error("Value not specified for the option: %s", options[i].name);
+        return false;
+      }
+
+      if (atoi(options[i].value) <= 0) {
+        error("Bad value for option: %s", options[i].name);
+        return false;
+      }
+
+      return true;
+      break;
     }
   }
 
diff --git a/scanner/util/pool.c b/scanner/util/pool.c
new file mode 100644
index 0000000..ad06fab
--- /dev/null
+++ b/scanner/util/pool.c
@@ -0,0 +1,118 @@
+#include "../inc/pool.h"
+#include <stdlib.h>
+
+work_t *pool_work(func_t func, void *arg) {
+  work_t *work = malloc(sizeof(work_t));
+  work->next = NULL;
+  work->func = func;
+  work->arg = arg;
+  return work;
+}
+
+void pool_free(work_t *work) { free(work); }
+
+work_t *pool_get(pool_t *tp) {
+  work_t *work;
+  work = tp->first;
+  if (NULL == work)
+    return NULL;
+
+  tp->first = work->next;
+  if (NULL == tp->first) {
+    tp->last = NULL;
+  }
+
+  return work;
+}
+
+void *pool_worker(void *arg) {
+  pool_t *tp = arg;
+  work_t *work;
+
+  while (true) {
+    pthread_mutex_lock(&(tp->mutex));
+    while (tp->first == NULL && !tp->stop)
+      pthread_cond_wait(&(tp->work_lock), &(tp->mutex));
+
+    if (tp->stop)
+      break;
+
+    work = pool_get(tp);
+    tp->active++;
+    pthread_mutex_unlock(&(tp->mutex));
+
+    if (work != NULL) {
+      work->func(work->arg);
+      pool_free(work);
+    }
+
+    pthread_mutex_lock(&(tp->mutex));
+    tp->active--;
+    if (!tp->stop && tp->active == 0 && tp->first == NULL)
+      pthread_cond_signal(&(tp->thread_lock));
+    pthread_mutex_unlock(&(tp->mutex));
+  }
+
+  tp->all--;
+  pthread_cond_signal(&(tp->thread_lock));
+  pthread_mutex_unlock(&(tp->mutex));
+  return NULL;
+}
+
+pool_t *pool_init(int n) {
+  pool_t *tp = calloc(1, sizeof(pool_t));
+  tp->all = n;
+
+  pthread_mutex_init(&(tp->mutex), NULL);
+  pthread_cond_init(&(tp->work_lock), NULL);
+  pthread_cond_init(&(tp->thread_lock), NULL);
+
+  tp->first = NULL;
+  tp->last = NULL;
+
+  pthread_t handle;
+  for (int i = 0; i < n; i++) {
+    pthread_create(&handle, NULL, pool_worker, tp);
+    pthread_detach(handle);
+  }
+  return tp;
+}
+
+bool pool_add(pool_t *tp, func_t func, void *arg) {
+  work_t *work = pool_work(func, arg);
+  if (work == NULL)
+    return false;
+
+  pthread_mutex_lock(&(tp->mutex));
+  if (tp->first == NULL) {
+    tp->first = work;
+    tp->last = tp->first;
+  } else {
+    tp->last->next = work;
+    tp->last = work;
+  }
+
+  pthread_cond_broadcast(&(tp->work_lock));
+  pthread_mutex_unlock(&(tp->mutex));
+  return true;
+}
+
+void pool_stop(pool_t *tp) {
+  pthread_mutex_lock(&(tp->mutex));
+
+  work_t *f = tp->first;
+  while (f != NULL) {
+    work_t *n = f->next;
+    pool_free(n);
+    f = n;
+  }
+
+  tp->stop = true;
+  pthread_cond_broadcast(&(tp->work_lock));
+  pthread_mutex_unlock(&(tp->mutex));
+
+  pthread_mutex_destroy(&(tp->mutex));
+  pthread_cond_destroy(&(tp->work_lock));
+  pthread_cond_destroy(&(tp->thread_lock));
+  free(tp);
+}
diff --git a/scanner/util/util.c b/scanner/util/util.c
index ab0cd5d..d9f8735 100644
--- a/scanner/util/util.c
+++ b/scanner/util/util.c
@@ -1,115 +1,97 @@
-#include <stdio.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
 
-#include "../inc/util.h"
 #include "../inc/log.h"
+#include "../inc/util.h"
 
 int common_ports[] = {
-  21, 990,        // ftp/ftps
-  23, 22,         // telnet/ssh
-  25, 465,        // smtp/smtps
-  80, 443,        // http/https
-  110, 995,       // pop3/pop3s
-  119, 563,       // nntp/nntps
-  143, 993,       // imap/imaps
-  6667, 6697,     // irc
-  137, 138, 139,  // netbios stuff
-  53,             // dns
-  69,             // tftp
-  902,            // vmware
-  873,            // rsync
-  445,            // smb
-  3389,           // rdp
+    21,   990,       // ftp/ftps
+    23,   22,        // telnet/ssh
+    25,   465,       // smtp/smtps
+    80,   443,       // http/https
+    110,  995,       // pop3/pop3s
+    119,  563,       // nntp/nntps
+    143,  993,       // imap/imaps
+    6667, 6697,      // irc
+    137,  138,  139, // netbios stuff
+    53,              // dns
+    69,              // tftp
+    902,             // vmware
+    873,             // rsync
+    445,             // smb
+    3389,            // rdp
 };
 
 // https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
-char* bad_ranges[] = {
-  "0.0.0.0/8",
-  "10.0.0.0/8",
-  "100.64.0.0/10",
-  "127.0.0.0/8",
-  "169.254.0.0/16",
-  "172.16.0.0/12",
-  "192.0.0.0/24",
-  "192.0.0.0/29",
-  "192.0.0.8/32",
-  "192.0.0.9/32",
-  "192.0.0.170/32",
-  "192.0.0.171/32",
-  "192.0.2.0/24",
-  "192.31.196.0/24",
-  "192.52.193.0/24",
-  "192.88.99.0/24",
-  "192.168.0.0/16",
-  "192.175.48.0/24",
-  "198.18.0.0/15",
-  "198.51.100.0/24",
-  "203.0.113.0/24",
-  "240.0.0.0/4",
-  "255.255.255.255/32"
-};
-int bad_range_size = sizeof(bad_ranges)/sizeof(char*);
-
-bool get_range(struct Range* res, char* ipnet){
-  char* cpy = strdup(ipnet);
-  char* ip = strtok(cpy, "/");
+char *bad_ranges[] = {
+    "0.0.0.0/8",      "10.0.0.0/8",      "100.64.0.0/10",     "127.0.0.0/8",
+    "169.254.0.0/16", "172.16.0.0/12",   "192.0.0.0/24",      "192.0.0.0/29",
+    "192.0.0.8/32",   "192.0.0.9/32",    "192.0.0.170/32",    "192.0.0.171/32",
+    "192.0.2.0/24",   "192.31.196.0/24", "192.52.193.0/24",   "192.88.99.0/24",
+    "192.168.0.0/16", "192.175.48.0/24", "198.18.0.0/15",     "198.51.100.0/24",
+    "203.0.113.0/24", "240.0.0.0/4",     "255.255.255.255/32"};
+int bad_range_size = sizeof(bad_ranges) / sizeof(char *);
+
+bool get_range(range_t *res, char *ipnet) {
+  char *cpy = strdup(ipnet);
+  char *ip = strtok(cpy, "/");
   if (NULL == ip)
     return false;
-  
-  char* net = strtok(NULL, "/");
+
+  char *net = strtok(NULL, "/");
   if (NULL == net || (res->net = atoi(net)) < 0 || res->net > 255)
     return false;
 
-  char* ip0 = strtok(ip, ".");
+  char *ip0 = strtok(ip, ".");
   if (NULL == ip0 || (res->ip[0] = atoi(ip0)) < 0 || res->ip[0] > 255)
     return false;
 
-  char* ip1 = strtok(NULL, ".");
+  char *ip1 = strtok(NULL, ".");
   if (NULL == ip1 || (res->ip[1] = atoi(ip1)) < 0 || res->ip[1] > 255)
     return false;
 
-  char* ip2 = strtok(NULL, ".");
+  char *ip2 = strtok(NULL, ".");
   if (NULL == ip2 || (res->ip[2] = atoi(ip2)) < 0 || res->ip[2] > 255)
     return false;
 
-  char* ip3 = strtok(NULL, ".");
+  char *ip3 = strtok(NULL, ".");
   if (NULL == ip3 || (res->ip[3] = atoi(ip3)) < 0 || res->ip[3] > 255)
     return false;
 
   return true;
 }
 
-int* parse_ports(char* ports, int* size) {
-  if(eq(ports, "common") || eq(ports, "c") || eq(ports, "top")){
-    *size = sizeof(common_ports)/sizeof(int);
+int *parse_ports(char *ports, int *size) {
+  if (eq(ports, "common") || eq(ports, "c") || eq(ports, "top")) {
+    *size = sizeof(common_ports) / sizeof(int);
     return common_ports;
   }
 
-  if(!contains(ports, '-') && !contains(ports, ',')){
+  if (!contains(ports, '-') && !contains(ports, ',')) {
     int port = atoi(ports);
-    if(port <= 0){
+    if (port <= 0) {
       error("Bad port number");
       return NULL;
     }
 
-    int* portlist = malloc(sizeof(int));
+    int *portlist = malloc(sizeof(int));
     portlist[0] = port;
     *size = 1;
     return portlist;
   }
 
-  if(contains(ports, '-')) {
-    char* rstart = strtok(ports, "-");
-    if(rstart == NULL){
+  if (contains(ports, '-')) {
+    char *rstart = strtok(ports, "-");
+    if (rstart == NULL) {
       error("Bad port range");
       return NULL;
     }
 
-    char* rstop = strtok(NULL, "-");
-    if(rstop == NULL){
+    char *rstop = strtok(NULL, "-");
+    if (rstop == NULL) {
       error("Bad port range");
       return NULL;
     }
@@ -117,51 +99,51 @@ int* parse_ports(char* ports, int* size) {
     int r1 = atoi(rstart);
     int r2 = atoi(rstop);
 
-    if(r1 <= 0 || r2 <= 0){
+    if (r1 <= 0 || r2 <= 0) {
       error("Bad port range numbers");
       return NULL;
     }
 
-    if(r2 <= r1) {
+    if (r2 <= r1) {
       error("Max port number should be bigger than min port number");
       return NULL;
     }
 
-    int* portlist = malloc(sizeof(int));
+    int *portlist = malloc(sizeof(int));
     int portsize = 0;
 
-    for(;r1 < r2; r1++){
+    for (; r1 < r2; r1++) {
       portlist[portsize] = r1;
       portsize++;
-      portlist = realloc(portlist, sizeof(int)*(portsize+1));
+      portlist = realloc(portlist, sizeof(int) * (portsize + 1));
     }
-    
+
     *size = portsize;
     return portlist;
   }
 
-  if(contains(ports, ',')) {
-    char* cur = strtok(ports, ",");
-    if(cur == NULL){
+  if (contains(ports, ',')) {
+    char *cur = strtok(ports, ",");
+    if (cur == NULL) {
       error("Bad port list");
       return NULL;
     }
 
-    int* portlist = malloc(sizeof(int));
+    int *portlist = malloc(sizeof(int));
     int portsize = 0;
 
-    do{
+    do {
       int curi = atoi(cur);
-      if(curi <= 0) {
+      if (curi <= 0) {
         error("Bad port number");
         return NULL;
       }
 
       portlist[portsize] = atoi(cur);
       portsize++;
-      portlist = realloc(portlist, sizeof(int)*(portsize+1));
+      portlist = realloc(portlist, sizeof(int) * (portsize + 1));
       cur = strtok(NULL, ",");
-    }while(cur != NULL);
+    } while (cur != NULL);
 
     *size = portsize;
     return portlist;
@@ -172,50 +154,52 @@ int* parse_ports(char* ports, int* size) {
 }
 
 void clean_ports(int *ports) {
-  if(ports == common_ports)
+  if (ports == common_ports)
     return;
-
   free(ports);
 }
 
-bool skip_range(struct Range* ranges, uint8_t* cur){
-  for(int i = 0; i < bad_range_size; i++){ 
-    if(ranges[i].net == 8 && 
-       ranges[i].ip[0] == cur[0]) return true;
-    
-    else if(ranges[i].net < 8 && 
-            ranges[i].ip[0] <= cur[0]) return true;
-    
-    else if(ranges[i].net == 16 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] == cur[1]) return true;
-
-    else if(ranges[i].net < 16 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] <= cur[1]) return true;
-
-    else if(ranges[i].net == 24 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] == cur[1] &&
-            ranges[i].ip[2] == cur[2]) return true;
-
-    else if(ranges[i].net < 24 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] == cur[1] &&
-            ranges[i].ip[2] <= cur[2]) return true;
-
-    else if(ranges[i].net == 32 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] == cur[1] &&
-            ranges[i].ip[2] == cur[2] &&
-            ranges[i].ip[3] == cur[3]) return true;
-
-    else if(ranges[i].net < 32 && 
-            ranges[i].ip[0] == cur[0] && 
-            ranges[i].ip[1] == cur[1] &&
-            ranges[i].ip[2] == cur[2] &&
-            ranges[i].ip[3] <= cur[3]) return true;
+bool skip_range(range_t *ranges, uint8_t *cur) {
+  for (int i = 0; i < bad_range_size; i++) {
+    if (ranges[i].net == 8 && ranges[i].ip[0] == cur[0])
+      return true;
+
+    else if (ranges[i].net < 8 && ranges[i].ip[0] <= cur[0])
+      return true;
+
+    else if (ranges[i].net == 16 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] == cur[1])
+      return true;
+
+    else if (ranges[i].net < 16 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] <= cur[1])
+      return true;
+
+    else if (ranges[i].net == 24 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] == cur[1] && ranges[i].ip[2] == cur[2])
+      return true;
+
+    else if (ranges[i].net < 24 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] == cur[1] && ranges[i].ip[2] <= cur[2])
+      return true;
+
+    else if (ranges[i].net == 32 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] == cur[1] && ranges[i].ip[2] == cur[2] &&
+             ranges[i].ip[3] == cur[3])
+      return true;
+
+    else if (ranges[i].net < 32 && ranges[i].ip[0] == cur[0] &&
+             ranges[i].ip[1] == cur[1] && ranges[i].ip[2] == cur[2] &&
+             ranges[i].ip[3] <= cur[3])
+      return true;
   }
 
   return false;
 }
+
+void urljoin(char *newurl, char *url, char *path) {
+  if (url[strlen(url) - 1] == '/')
+    sprintf(newurl, "%s%s", url, path);
+  else
+    sprintf(newurl, "%s/%s", url, path);
+}