diff --git a/keyboards/fatotesa/info.json b/keyboards/fatotesa/info.json
new file mode 100644
index 0000000000..bdd5e40478
--- /dev/null
+++ b/keyboards/fatotesa/info.json
@@ -0,0 +1,144 @@
+{
+    "development_board": "promicro",
+    "manufacturer": "fatotesa",
+    "keyboard_name": "fatotesa",
+    "maintainer": "stefangluszek",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "caps_word": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D1", "pin_b": "D0" , "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "usb_detect": {
+            "enabled": true,
+            "timeout": 2500
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "C6", "F7", "B1", "B3", "B2"],
+                "rows": ["B6", "E6", "D4", "D7", "B4", "B5"]
+            }
+        },
+        "bootmagic": {
+            "matrix": [4, 1]
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", null],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label":"esc", "x":0, "y":0},
+                {"matrix": [0, 2], "label":"f1", "x":2, "y":0},
+                {"matrix": [0, 3], "label":"f2", "x":3, "y":0},
+                {"matrix": [0, 4], "label":"f3", "x":4, "y":0},
+                {"matrix": [0, 5], "label":"f4", "x":5, "y":0},
+
+                {"matrix": [6, 4], "label":"end", "x":13.25, "y":0},
+                {"matrix": [6, 5], "label":"ins", "x":14.25, "y":0},
+                {"matrix": [6, 6], "label":"del", "x":15.25, "y":0},
+                {"matrix": [6, 7], "label":"enc", "x":16.5, "y":0, "encoder": 0},
+
+
+                {"matrix": [1, 0], "label":"`", "x":0, "y":1},
+                {"matrix": [1, 1], "label":"1", "x":1, "y":1},
+                {"matrix": [1, 2], "label":"2", "x":2, "y":1},
+                {"matrix": [1, 3], "label":"3", "x":3, "y":1},
+                {"matrix": [1, 4], "label":"4", "x":4, "y":1},
+                {"matrix": [1, 5], "label":"5", "x":5, "y":1},
+                {"matrix": [1, 6], "label":"6", "x":6, "y":1},
+
+                {"matrix": [7, 1], "label":"7", "x":9.5, "y":1},
+                {"matrix": [7, 2], "label":"8", "x":10.5, "y":1},
+                {"matrix": [7, 3], "label":"9", "x":11.5, "y":1},
+                {"matrix": [7, 4], "label":"0", "x":12.5, "y":1},
+                {"matrix": [7, 5], "label":"-", "x":13.5, "y":1},
+                {"matrix": [7, 6], "label":"=", "x":14.5, "y":1},
+                {"matrix": [7, 7], "label":"<", "x":15.5, "y":1, "w":2},
+
+
+                {"matrix": [2, 0], "label":"tab", "x":0, "y":2, "w":1.5},
+                {"matrix": [2, 1], "label":"q", "x":1.5, "y":2},
+                {"matrix": [2, 2], "label":"w", "x":2.5, "y":2},
+                {"matrix": [2, 3], "label":"e", "x":3.5, "y":2},
+                {"matrix": [2, 4], "label":"r", "x":4.5, "y":2},
+                {"matrix": [2, 5], "label":"t", "x":5.5, "y":2},
+
+                {"matrix": [8, 0], "label":"y", "x":9, "y":2},
+                {"matrix": [8, 1], "label":"u", "x":10, "y":2},
+                {"matrix": [8, 2], "label":"i", "x":11, "y":2},
+                {"matrix": [8, 3], "label":"o", "x":12, "y":2},
+                {"matrix": [8, 4], "label":"p", "x":13, "y":2},
+                {"matrix": [8, 5], "label":"[", "x":14, "y":2},
+                {"matrix": [8, 6], "label":"]", "x":15, "y":2},
+                {"matrix": [8, 7], "x":16.25, "y":2, "w":1.25, "h":2},
+
+
+                {"matrix": [3, 0], "label":"caps", "x":0, "y":3, "w":1.75},
+                {"matrix": [3, 1], "label":"a", "x":1.75, "y":3},
+                {"matrix": [3, 2], "label":"s", "x":2.75, "y":3},
+                {"matrix": [3, 3], "label":"d", "x":3.75, "y":3},
+                {"matrix": [3, 4], "label":"f", "x":4.75, "y":3},
+                {"matrix": [3, 5], "label":"g", "x":5.75, "y":3},
+
+                {"matrix": [9, 0], "label":"h", "x":9.25, "y":3},
+                {"matrix": [9, 1], "label":"j", "x":10.25, "y":3},
+                {"matrix": [9, 2], "label":"k", "x":11.25, "y":3},
+                {"matrix": [9, 3], "label":"l", "x":12.25, "y":3},
+                {"matrix": [9, 4], "label":";", "x":13.25, "y":3},
+                {"matrix": [9, 5], "label":"'", "x":14.25, "y":3},
+                {"matrix": [9, 6], "label":"\\", "x":15.25, "y":3},
+
+
+                {"matrix": [4, 0], "label":"shift", "x":0, "y":4, "w":1.25},
+                {"matrix": [4, 1], "label":"<", "x":1.25, "y":4},
+                {"matrix": [4, 2], "label":"z", "x":2.25, "y":4},
+                {"matrix": [4, 3], "label":"x", "x":3.25, "y":4},
+                {"matrix": [4, 4], "label":"c", "x":4.25, "y":4},
+                {"matrix": [4, 5], "label":"v", "x":5.25, "y":4},
+                {"matrix": [4, 6], "label":"b", "x":6.25, "y":4},
+
+                {"matrix": [10, 2], "label":"n", "x":9.75, "y":4},
+                {"matrix": [10, 3], "label":"m", "x":10.75, "y":4},
+                {"matrix": [10, 4], "label":",", "x":11.75, "y":4},
+                {"matrix": [10, 5], "label":".", "x":12.75, "y":4},
+                {"matrix": [10, 6], "label":"/", "x":13.75, "y":4},
+                {"matrix": [10, 7], "x":14.75, "y":4},
+
+
+                {"matrix": [5, 0], "label":"ctrl", "x":0, "y":5, "w":1.25},
+                {"matrix": [5, 1], "label":"win", "x":1.25, "y":5, "w":1.25},
+                {"matrix": [5, 2], "label":"alt", "x":2.5, "y":5, "w":1.25},
+                {"matrix": [5, 3], "label":"space", "x":3.75, "y":5, "w":1.75},
+                {"matrix": [5, 4], "label":"na", "x":5.5, "y":5},
+
+                {"matrix": [11, 3], "label":"space", "x":10.5, "y":5, "w":2},
+                {"matrix": [11, 4], "label":"alt gr", "x":12.5, "y":5, "w":1.25},
+                {"matrix": [11, 5], "label":"ctrl", "x":13.75, "y":5, "w":1.25},
+                {"matrix": [11, 6], "label":"?", "x":15, "y":5, "w":1.25},
+                {"matrix": [11, 7], "label":"?", "x":16.25, "y":5, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fatotesa/keymaps/default/keymap.c b/keyboards/fatotesa/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1f6aa80488
--- /dev/null
+++ b/keyboards/fatotesa/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+};
+#endif
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4,                                                                 KC_END, KC_INSERT, KC_DELETE, KC_KB_MUTE,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,                                        KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        LT(1, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T,                        KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_ENTER,
+        KC_LEFT_CTRL, KC_A, KC_S, KC_D, KC_F, KC_G,                                      KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_BACKSLASH,
+        KC_LEFT_SHIFT, KC_LEFT_ANGLE_BRACKET, KC_Z, KC_X, KC_C, KC_V, KC_B,                    KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        CW_TOGG, KC_LWIN, KC_LEFT_ALT, KC_BACKSPACE, KC_LEFT_ALT,                                 KC_SPACE, KC_RIGHT_ALT, KC_RIGHT_CTRL, KC_NO, KC_NO
+        ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______,                                                                 _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                              _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_DEL, _______,                                                        _______, _______, _______, _______, _______
+        )};
diff --git a/keyboards/fatotesa/keymaps/default/rules.mk b/keyboards/fatotesa/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/fatotesa/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/fatotesa/readme.md b/keyboards/fatotesa/readme.md
new file mode 100644
index 0000000000..a3794cfd66
--- /dev/null
+++ b/keyboards/fatotesa/readme.md
@@ -0,0 +1,25 @@
+# fatotesa
+
+![fatotesa](https://i.imgur.com/LbxQcU2.png)
+
+This is the QMK firmware for the [fat-o-tesa](https://github.com/stefangluszek/fat-o-tesa) keyboard.
+
+* Keyboard Maintainer: [Stefan Gluszek](https://github.com/stefangluszek)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fatotesa:default
+
+Flashing example for this keyboard:
+
+    make fatotesa:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (4,1) in the matrix and plug in the keyboard - this is somewhat unusual choice but our split halves are not symmetrical and we can't use (0,0) but instead a key that maps to the same matrix position regardless of which part is being connected to the computer and flashed.
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/fatotesa/rules.mk b/keyboards/fatotesa/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/fatotesa/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank