[Keyboard] Added support for a new keyboard - Ishi 80 Mk0 (#19195)

18 files changed, 796 insertions, 0 deletions

diff --git a/keyboards/argo_works/ishi/80/mk0_avr/config.h b/keyboards/argo_works/ishi/80/mk0_avr/config.h
new file mode 100644
index 0000000000..9f36bc521d
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 Jason Devadoss (@jasonj2232)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json
new file mode 100644
index 0000000000..f685d6a20a
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/info.json
@@ -0,0 +1,111 @@
+ {
+    "manufacturer": "Argo Works",
+    "keyboard_name": "Ishi 80 Mk 0",
+    "maintainer": "jasonj2232",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "url": "https://qmk.fm/keyboards/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4930",
+        "vid": "0x4157"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
+        "rows": ["B3", "B1", "B6", "B2", "D1", "D0", "B5", "B4", "E6"]
+    },    
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [1, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 0], "x": 1, "y": 0 },
+                { "matrix": [1, 1], "x": 2, "y": 0 },
+                { "matrix": [0, 1], "x": 3, "y": 0 },
+                { "matrix": [1, 2], "x": 5.25, "y": 0 },
+                { "matrix": [0, 2], "x": 6.25, "y": 0 },
+                { "matrix": [1, 3], "x": 7.25, "y": 0 },
+                { "matrix": [0, 3], "x": 8.25, "y": 0 },
+                { "matrix": [1, 4], "x": 9.25, "y": 0 },
+                { "matrix": [0, 4], "x": 10.25, "y": 0 },
+                { "matrix": [1, 5], "x": 11.25, "y": 0 },
+                { "matrix": [0, 5], "x": 12.25, "y": 0 },
+                { "matrix": [1, 6], "x": 13.25, "y": 0 },
+                { "matrix": [0, 6], "x": 14.25, "y": 0 },
+                { "matrix": [1, 7], "x": 15.25, "y": 0 },
+                { "matrix": [0, 7], "x": 16.25, "y": 0 },
+                { "matrix": [1, 8], "x": 17.25, "y": 0 },
+                { "matrix": [0, 8], "x": 18.25, "y": 0, "w": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 1, "h": 2 },
+                { "matrix": [2, 0], "x": 1, "y": 1 },
+                { "matrix": [3, 1], "x": 2, "y": 1 },
+                { "matrix": [2, 1], "x": 3, "y": 1 },
+                { "matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5 },
+                { "matrix": [2, 2], "x": 6.75, "y": 1 },
+                { "matrix": [3, 3], "x": 7.75, "y": 1 },
+                { "matrix": [2, 3], "x": 8.75, "y": 1 },
+                { "matrix": [3, 4], "x": 9.75, "y": 1 },
+                { "matrix": [2, 4], "x": 10.75, "y": 1 },
+                { "matrix": [3, 5], "x": 11.75, "y": 1 },
+                { "matrix": [2, 5], "x": 12.75, "y": 1 },
+                { "matrix": [3, 6], "x": 13.75, "y": 1 },
+                { "matrix": [2, 6], "x": 14.75, "y": 1 },
+                { "matrix": [3, 7], "x": 15.75, "y": 1 },
+                { "matrix": [2, 7], "x": 16.75, "y": 1 },
+                { "matrix": [3, 8], "x": 17.75, "y": 1 },
+                { "matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5 },
+                { "matrix": [4, 0], "x": 1, "y": 2 },
+                { "matrix": [5, 1], "x": 2, "y": 2 },
+                { "matrix": [4, 1], "x": 3, "y": 2 },
+                { "matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75 },
+                { "matrix": [4, 2], "x": 7, "y": 2 },
+                { "matrix": [5, 3], "x": 8, "y": 2 },
+                { "matrix": [4, 3], "x": 9, "y": 2 },
+                { "matrix": [5, 4], "x": 10, "y": 2 },
+                { "matrix": [4, 4], "x": 11, "y": 2 },
+                { "matrix": [5, 5], "x": 12, "y": 2 },
+                { "matrix": [4, 5], "x": 13, "y": 2 },
+                { "matrix": [5, 6], "x": 14, "y": 2 },
+                { "matrix": [4, 6], "x": 15, "y": 2 },
+                { "matrix": [5, 7], "x": 16, "y": 2 },
+                { "matrix": [4, 7], "x": 17, "y": 2 },
+                { "matrix": [4, 8], "x": 18, "y": 2, "w": 2.25 },
+                { "matrix": [7, 0], "x": 0, "y": 3, "h": 2 },
+                { "matrix": [6, 0], "x": 1, "y": 3 },
+                { "matrix": [7, 1], "x": 2, "y": 3 },
+                { "matrix": [6, 1], "x": 3, "y": 3 },
+                { "matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25 },
+                { "matrix": [7, 3], "x": 7.5, "y": 3 },
+                { "matrix": [6, 3], "x": 8.5, "y": 3 },
+                { "matrix": [7, 4], "x": 9.5, "y": 3 },
+                { "matrix": [6, 4], "x": 10.5, "y": 3 },
+                { "matrix": [7, 5], "x": 11.5, "y": 3 },
+                { "matrix": [6, 5], "x": 12.5, "y": 3 },
+                { "matrix": [7, 6], "x": 13.5, "y": 3 },
+                { "matrix": [6, 6], "x": 14.5, "y": 3 },
+                { "matrix": [7, 7], "x": 15.5, "y": 3 },
+                { "matrix": [6, 7], "x": 16.5, "y": 3 },
+                { "matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75 },
+                { "matrix": [8, 0], "x": 1, "y": 4 },
+                { "matrix": [8, 1], "x": 2, "y": 4, "w": 2 },
+                { "matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25 },
+                { "matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25 },
+                { "matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25 },
+                { "matrix": [8, 4], "x": 9, "y": 4, "w": 6.25 },
+                { "matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25 },
+                { "matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25 },
+                { "matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25 },
+                { "matrix": [7, 8], "x": 19, "y": 4, "w": 1.25 },
+                { "matrix": [8, 8], "x": 21.5, "y": 4 }
+            ]
+        }
+    }     
+}
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/keymaps/default/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b5f75a5428
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    BL,
+    UL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BL] = LAYOUT(
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     KC_ESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_PPLS, KC_P9,   KC_P8,   KC_P7,      KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                 KC_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_PENT, KC_P3,   KC_P2,   KC_P1,      KC_LSFT,      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+                 KC_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
+
+    ),
+    
+    [UL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UP,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_LEFT,KC_DOWN, KC_DOWN,    KC_MPLY
+    ),
+};
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f0c0cfad96
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    BL,
+    UL,
+    TL,
+    FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BL] = LAYOUT(
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     KC_ESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_PPLS, KC_P9,   KC_P8,   KC_P7,      KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                 KC_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_PENT, KC_P3,   KC_P2,   KC_P1,      KC_LSFT,      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+                 KC_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
+
+    ),
+    
+    [UL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UP,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_LEFT,KC_DOWN, KC_DOWN,    KC_MPLY
+    ),
+
+    [TL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,     KC_TRNS
+    ),
+
+    [FL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,     KC_TRNS
+    ),
+};
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/readme.md b/keyboards/argo_works/ishi/80/mk0_avr/readme.md
new file mode 100644
index 0000000000..7f7919951e
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/readme.md
@@ -0,0 +1,29 @@
+# Ishi 80 Mk 0
+
+![argo_works/ishi/80/mk0_avr](https://i.imgur.com/TVn6zeqh.jpeg)
+
+Ishi 80 is a 60% keyboard with a SouthPaw, Mirrored Numpad. 
+
+Note: This firmware is for ATMega32U4 based daughterboards with the standard Pro-Micro footprint. It does not support the Encoder and OLED display functionality.
+
+* Keyboard Maintainer: [Jason Devadoss](https://github.com/jasonj2232)
+* Hardware Supported: Ishi80 Mk 0 with standard Pro Micro footprint daughterboards
+* Hardware Availability: -
+
+Make example for this keyboard (after setting up your build environment):
+
+    make argo_works/ishi/80/mk0_avr:default
+
+Flashing example for this keyboard:
+
+    make argo_works/ishi/80/mk0_avr: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 (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **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/argo_works/ishi/80/mk0_avr/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
new file mode 100644
index 0000000000..eef1ee614e
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Jason Devadoss (@jasonj2232)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
+
+//Uncomment the below if the encoder direction is flipped/opposite to what is expected
+
+//#define ENCODER_DIRECTION_FLIP
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
new file mode 100644
index 0000000000..e96b2fd497
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
@@ -0,0 +1,117 @@
+ {
+    "manufacturer": "Argo Works",
+    "keyboard_name": "Ishi 80 Mk 0",
+    "maintainer": "jasonj2232",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "diode_direction": "COL2ROW",
+    "url": "https://qmk.fm/keyboards/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4930",
+        "vid": "0x4157"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
+        "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"]
+    },    
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [1, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 0], "x": 1, "y": 0 },
+                { "matrix": [1, 1], "x": 2, "y": 0 },
+                { "matrix": [0, 1], "x": 3, "y": 0 },
+                { "matrix": [1, 2], "x": 5.25, "y": 0 },
+                { "matrix": [0, 2], "x": 6.25, "y": 0 },
+                { "matrix": [1, 3], "x": 7.25, "y": 0 },
+                { "matrix": [0, 3], "x": 8.25, "y": 0 },
+                { "matrix": [1, 4], "x": 9.25, "y": 0 },
+                { "matrix": [0, 4], "x": 10.25, "y": 0 },
+                { "matrix": [1, 5], "x": 11.25, "y": 0 },
+                { "matrix": [0, 5], "x": 12.25, "y": 0 },
+                { "matrix": [1, 6], "x": 13.25, "y": 0 },
+                { "matrix": [0, 6], "x": 14.25, "y": 0 },
+                { "matrix": [1, 7], "x": 15.25, "y": 0 },
+                { "matrix": [0, 7], "x": 16.25, "y": 0 },
+                { "matrix": [1, 8], "x": 17.25, "y": 0 },
+                { "matrix": [0, 8], "x": 18.25, "y": 0, "w": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 1, "h": 2 },
+                { "matrix": [2, 0], "x": 1, "y": 1 },
+                { "matrix": [3, 1], "x": 2, "y": 1 },
+                { "matrix": [2, 1], "x": 3, "y": 1 },
+                { "matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5 },
+                { "matrix": [2, 2], "x": 6.75, "y": 1 },
+                { "matrix": [3, 3], "x": 7.75, "y": 1 },
+                { "matrix": [2, 3], "x": 8.75, "y": 1 },
+                { "matrix": [3, 4], "x": 9.75, "y": 1 },
+                { "matrix": [2, 4], "x": 10.75, "y": 1 },
+                { "matrix": [3, 5], "x": 11.75, "y": 1 },
+                { "matrix": [2, 5], "x": 12.75, "y": 1 },
+                { "matrix": [3, 6], "x": 13.75, "y": 1 },
+                { "matrix": [2, 6], "x": 14.75, "y": 1 },
+                { "matrix": [3, 7], "x": 15.75, "y": 1 },
+                { "matrix": [2, 7], "x": 16.75, "y": 1 },
+                { "matrix": [3, 8], "x": 17.75, "y": 1 },
+                { "matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5 },
+                { "matrix": [4, 0], "x": 1, "y": 2 },
+                { "matrix": [5, 1], "x": 2, "y": 2 },
+                { "matrix": [4, 1], "x": 3, "y": 2 },
+                { "matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75 },
+                { "matrix": [4, 2], "x": 7, "y": 2 },
+                { "matrix": [5, 3], "x": 8, "y": 2 },
+                { "matrix": [4, 3], "x": 9, "y": 2 },
+                { "matrix": [5, 4], "x": 10, "y": 2 },
+                { "matrix": [4, 4], "x": 11, "y": 2 },
+                { "matrix": [5, 5], "x": 12, "y": 2 },
+                { "matrix": [4, 5], "x": 13, "y": 2 },
+                { "matrix": [5, 6], "x": 14, "y": 2 },
+                { "matrix": [4, 6], "x": 15, "y": 2 },
+                { "matrix": [5, 7], "x": 16, "y": 2 },
+                { "matrix": [4, 7], "x": 17, "y": 2 },
+                { "matrix": [4, 8], "x": 18, "y": 2, "w": 2.25 },
+                { "matrix": [7, 0], "x": 0, "y": 3, "h": 2 },
+                { "matrix": [6, 0], "x": 1, "y": 3 },
+                { "matrix": [7, 1], "x": 2, "y": 3 },
+                { "matrix": [6, 1], "x": 3, "y": 3 },
+                { "matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25 },
+                { "matrix": [7, 3], "x": 7.5, "y": 3 },
+                { "matrix": [6, 3], "x": 8.5, "y": 3 },
+                { "matrix": [7, 4], "x": 9.5, "y": 3 },
+                { "matrix": [6, 4], "x": 10.5, "y": 3 },
+                { "matrix": [7, 5], "x": 11.5, "y": 3 },
+                { "matrix": [6, 5], "x": 12.5, "y": 3 },
+                { "matrix": [7, 6], "x": 13.5, "y": 3 },
+                { "matrix": [6, 6], "x": 14.5, "y": 3 },
+                { "matrix": [7, 7], "x": 15.5, "y": 3 },
+                { "matrix": [6, 7], "x": 16.5, "y": 3 },
+                { "matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75 },
+                { "matrix": [8, 0], "x": 1, "y": 4 },
+                { "matrix": [8, 1], "x": 2, "y": 4, "w": 2 },
+                { "matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25 },
+                { "matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25 },
+                { "matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25 },
+                { "matrix": [8, 4], "x": 9, "y": 4, "w": 6.25 },
+                { "matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25 },
+                { "matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25 },
+                { "matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25 },
+                { "matrix": [7, 8], "x": 19, "y": 4, "w": 1.25 },
+                { "matrix": [8, 8], "x": 21.5, "y": 4 }
+            ]
+        }
+    },
+    "encoder": {
+        "rotary": [
+                { "pin_a": "B7", "pin_b": "D5" }
+            ]
+    }       
+}
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c
new file mode 100644
index 0000000000..cd0bd4a644
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    BL,
+    UL,
+};
+
+// OLED setup for bongocat
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 30
+#define TAP_FRAMES 2
+#define TAP_SPEED 40
+#define ANIM_FRAME_DURATION 200
+#define ANIM_SIZE 512
+
+static long int oled_timeout = 600000; // 10 minutes
+bool gui_on = true;
+char wpm_str[10];
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BL] = LAYOUT(
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     KC_ESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_PPLS, KC_P9,   KC_P8,   KC_P7,      KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                 KC_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_PENT, KC_P3,   KC_P2,   KC_P1,      KC_LSFT,      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+                 KC_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
+
+    ),
+    
+    [UL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_UP,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,    KC_MPLY
+    ),
+};
+
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [BL] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [UL] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    };
+#endif
+
+#ifdef OLED_ENABLE
+
+//Uncomment the below if OLED orientation is incorrect
+/*
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees
+}
+*/
+
+static void render_anim(void) {
+
+    // Idle animation
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        },
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        },
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
+            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        },
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        },
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
+            32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        }
+
+    };
+
+    // Prep animation
+    static const char PROGMEM prep[][ANIM_SIZE] = {
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
+            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        }
+
+    };
+
+    // Typing animation
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
+            95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
+            1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        },
+
+        {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
+            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        }
+
+    };
+
+    void animation_phase(void) {
+        if (get_current_wpm() <=IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED) {
+            oled_write_raw_P(prep[0], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() >=TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
+        }
+    }
+
+    if (get_current_wpm() != 000) {
+        oled_on();
+
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > oled_timeout) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+bool oled_task_user(void) {
+        render_anim();
+        oled_set_cursor(0,4);
+        sprintf(wpm_str, "WPM: %03d", get_current_wpm());
+        oled_write(wpm_str, false);
+
+    return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/keymap.c
new file mode 100644
index 0000000000..11bfab17ad
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    BL,
+    UL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BL] = LAYOUT(
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     KC_ESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_PPLS, KC_P9,   KC_P8,   KC_P7,      KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                 KC_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_PENT, KC_P3,   KC_P2,   KC_P1,      KC_LSFT,      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+                 KC_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
+
+    ),
+    
+    [UL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UP,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_LEFT,KC_DOWN, KC_RIGHT,    KC_MPLY
+    ),
+};
+
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [BL] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [UL] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    };
+#endif
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a9dd39c342
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    BL,
+    UL,
+    TL,
+    FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BL] = LAYOUT(
+        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     KC_ESC,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_PPLS, KC_P9,   KC_P8,   KC_P7,      KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                 KC_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_PENT, KC_P3,   KC_P2,   KC_P1,      KC_LSFT,      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+                 KC_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
+
+    ),
+    
+    [UL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UP,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_LEFT,KC_DOWN, KC_RIGHT,    KC_MPLY
+    ),
+
+    [TL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,     KC_TRNS
+    ),
+
+    [FL] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+                 KC_TRNS,          KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS,                           KC_TRNS,                             KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,     KC_TRNS
+    ),
+};
+
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+        [BL] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+        [UL] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+        [TL] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+        [FL] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    };
+#endif
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6ccd6d9194
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
new file mode 100644
index 0000000000..83d591eb0a
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Jason Devadoss (@jasonj2232)
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#ifdef OLED_ENABLE
+static void render_logo(void) {
+    static const char PROGMEM raw_logo[] = {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,240,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,240,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 20, 18, 18, 20,120,  0,  0,126, 10, 26, 58,106, 78,  0,  0,126, 66, 82, 82, 82,114,  0,  0,126, 66, 66, 66, 66,126,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,  0,  0,252,252,140,140,140,140,140,140,140,140,140,140,140,140,  0,  0,252,252,128,128,128,128,128,128,128,128,128,128,128,252,252,  0,  0,255,255,255,  0,  0,  0,  0,  0,  0,255,255,153,153,255,255,  0,  0,255,255,195,195,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62, 64, 48, 48, 64, 62,  0,  0,126, 66, 66, 66, 66,126,  0,  0,126, 10, 26, 58,106, 78,  0,  0,126, 24, 60,102, 66, 66,  0,  0, 36, 74, 74, 82, 82, 36,  0,  0,  0,255,255,255,  0,  0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 63, 63,  0,  0, 63, 63,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 63, 63,  0,  0,255,255,255,  0,  0,  0,  0,  0,  0,252,  8, 16,  8,252, 48, 72,132,  0,  0,120,132,132,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 15, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 15, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+        }
+    render_logo();
+    return true;
+}
+#endif
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/readme.md b/keyboards/argo_works/ishi/80/mk0_avr_extra/readme.md
new file mode 100644
index 0000000000..89fa9fbaca
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/readme.md
@@ -0,0 +1,29 @@
+# Ishi 80 Mk 0
+
+![argo_works/ishi/80/mk0_avr_extra](https://i.imgur.com/TVn6zeqh.jpeg)
+
+Ishi 80 is a 60% keyboard with a SouthPaw, Mirrored Numpad. 
+
+Note: This firmware is for ATMega32U4 based daughterboards that have 5 extra pins on the bottom, such as the Elite-C. It is incompatible with standard Pro-Micro footprint daughterboards.
+
+* Keyboard Maintainer: [Jason Devadoss](https://github.com/jasonj2232)
+* Hardware Supported: Ishi80 Mk 0 with Elite-C footprint daughterboards
+* Hardware Availability: -
+
+Make example for this keyboard (after setting up your build environment):
+
+    make argo_works/ishi/80/mk0_avr_extra:default
+
+Flashing example for this keyboard:
+
+    make argo_works/ishi/80/mk0_avr_extra: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 (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **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/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
new file mode 100644
index 0000000000..93c8491671
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
@@ -0,0 +1,4 @@
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
+PIN_COMPATIBLE = elite_c
\ No newline at end of file