diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
new file mode 100644
index 000000000..bcb8918b1
--- /dev/null
+++ b/keyboards/edc40/config.h
@@ -0,0 +1,50 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 .
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4F4A // "OJ"
+#define PRODUCT_ID 0x0002
+#define DEVICE_VER 0x0001
+#define MANUFACTURER OJ
+#define PRODUCT edc40
+
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+ #define MATRIX_ROW_PINS { D4, D6, D7, F7 }
+ #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
+ #define UNUSED_PINS
+
+ #define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+#define RGB_DI_PIN C6
diff --git a/keyboards/edc40/edc40.c b/keyboards/edc40/edc40.c
new file mode 100644
index 000000000..96746d4f3
--- /dev/null
+++ b/keyboards/edc40/edc40.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 .
+ */
+#include "edc40.h"
diff --git a/keyboards/edc40/edc40.h b/keyboards/edc40/edc40.h
new file mode 100644
index 000000000..d946eadd4
--- /dev/null
+++ b/keyboards/edc40/edc40.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 .
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K210, \
+ K300, K301, K305, K308, K310 \
+) \
+{ \
+ {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
+ {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K110}, \
+ {K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K210}, \
+ {K300, K301, KC_NO, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, KC_NO, K310} \
+}
diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json
new file mode 100644
index 000000000..1585294bc
--- /dev/null
+++ b/keyboards/edc40/info.json
@@ -0,0 +1,54 @@
+{
+ "keyboard_name": "edc40",
+ "url": "",
+ "maintainer": "ojthetiny",
+ "width": 12,
+ "height": 4,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0},
+ {"x": 1, "y": 0},
+ {"x": 2, "y": 0},
+ {"x": 3, "y": 0},
+ {"x": 4, "y": 0},
+ {"x": 5, "y": 0},
+ {"x": 6, "y": 0},
+ {"x": 7, "y": 0},
+ {"x": 8, "y": 0},
+ {"x": 9, "y": 0},
+ {"x": 10, "y": 0},
+ {"x": 11, "y": 0},
+
+ {"x": 0, "y": 1, "w":1.25},
+ {"x": 1.25, "y": 1},
+ {"x": 2.25, "y": 1},
+ {"x": 3.25, "y": 1},
+ {"x": 4.25, "y": 1},
+ {"x": 5.25, "y": 1},
+ {"x": 6.25, "y": 1},
+ {"x": 7.25, "y": 1},
+ {"x": 8.25, "y": 1},
+ {"x": 9.25, "y": 1},
+ {"x": 10.25, "y": 1, "w":1.75},
+
+ {"x": 0, "y": 2, "w":1.75},
+ {"x": 1.75, "y": 2},
+ {"x": 2.75, "y": 2},
+ {"x": 3.75, "y": 2},
+ {"x": 4.75, "y": 2},
+ {"x": 5.75, "y": 2},
+ {"x": 6.75, "y": 2},
+ {"x": 7.75, "y": 2},
+ {"x": 8.75, "y": 2},
+ {"x": 9.75, "y": 2, "w":2.25},
+
+ {"x": 0, "y": 3, "w":1.25},
+ {"x": 1.25, "y": 3, "w":1.25},
+ {"x": 2.5, "y": 3, "w":7},
+ {"x": 9.5, "y": 3, "w":1.25},
+ {"x": 10.75, "y": 3, "w":1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/edc40/keymaps/default/keymap.c b/keyboards/edc40/keymaps/default/keymap.c
new file mode 100644
index 000000000..88d4eed23
--- /dev/null
+++ b/keyboards/edc40/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layers{
+ L0,
+ L1,
+ L2
+};
+
+const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
+ [L0] = LAYOUT( /* Base Layer */
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
+ KC_LCTL, KC_LGUI, LT(L1, KC_SPC), KC_RALT, MO(L2)
+ ),
+ [L1] = LAYOUT( /* Num Layer */
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_BSLS,
+ _______, _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_SLSH,
+ _______, _______, _______, _______, KC_EQL
+ ),
+ [L2] = LAYOUT( /* F-Keys */
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_ENT,
+ _______, KC_VOLD, _______, KC_VOLU, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/edc40/keymaps/default/readme.md b/keyboards/edc40/keymaps/default/readme.md
new file mode 100644
index 000000000..127f7c563
--- /dev/null
+++ b/keyboards/edc40/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default keymap for edc40
diff --git a/keyboards/edc40/keymaps/oj/keymap.c b/keyboards/edc40/keymaps/oj/keymap.c
new file mode 100644
index 000000000..1946750c1
--- /dev/null
+++ b/keyboards/edc40/keymaps/oj/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layers{
+ _QW,
+ _DV,
+ _CM,
+ _L1,
+ _L2,
+ _L3
+};
+enum custom_keycodes {
+ DVORAK = SAFE_RANGE,
+ QWERTY,
+ COLEMAK
+};
+
+
+const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QW] = LAYOUT( /* Qwerty */
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
+ KC_TAB, KC_LGUI, KC_SPC, MO(_L1), MO(_L2)
+ ),
+ [_DV] = LAYOUT( /* Dvorak */
+ KC_ESC, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_QUOT,
+ KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
+ KC_LSFT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
+ KC_TAB, KC_LGUI, KC_SPC, MO(_L1), MO(_L2)
+ ),
+ [_CM] = LAYOUT( /* Colemak */
+ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_QUOT,
+ KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT,
+ KC_TAB, KC_LGUI, KC_SPC, MO(_L1), MO(_L2)
+ ),
+ [_L1] = LAYOUT( /* NUM */
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
+ _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_SCLN, KC_BSLS,
+ _______, _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINUS, KC_EQL,
+ _______, _______, _______, _______, _______
+ ),
+ [_L2] = LAYOUT( /* F Keys */
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, UC(0xc3b6), UC(0xc3a4), KC_ENT,
+ _______, QWERTY, DVORAK, COLEMAK, TG(_L3), _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______
+ ),
+ [_L3] = LAYOUT( /*Gaming */
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_F1, KC_F2, KC_F3, KC_F4, _______,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, _______, KC_F5, KC_F6, KC_F7, KC_F8, _______,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______,
+ KC_LSFT, KC_B, KC_SPC, MO(_L2), _______
+ )
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch(keycode) {
+ case DVORAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_DV);
+ }
+ return false;
+ case QWERTY:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_QW);
+ }
+ return false;
+ case COLEMAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_CM);
+ }
+ return false;
+ default:
+ return true;
+ }
+ return true;
+};
diff --git a/keyboards/edc40/keymaps/oj/readme.md b/keyboards/edc40/keymaps/oj/readme.md
new file mode 100644
index 000000000..8e21176ad
--- /dev/null
+++ b/keyboards/edc40/keymaps/oj/readme.md
@@ -0,0 +1 @@
+# Objectively the best keymap for EDC40
\ No newline at end of file
diff --git a/keyboards/edc40/readme.md b/keyboards/edc40/readme.md
new file mode 100644
index 000000000..8901ce713
--- /dev/null
+++ b/keyboards/edc40/readme.md
@@ -0,0 +1,13 @@
+# EDC40
+
+An everyday carry 40% keyboard
+
+* Keyboard Maintainer: [OJ](https://github.com/ojthetiny)
+* Hardware Supported: EDC40 PCB
+* Hardware Availabilty: TeslaSkeys
+
+Make example for this keyboard (after setting up your build environment):
+
+ make edc40:default
+
+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).
diff --git a/keyboards/edc40/rules.mk b/keyboards/edc40/rules.mk
new file mode 100644
index 000000000..c5128a8f2
--- /dev/null
+++ b/keyboards/edc40/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+UNICODE_ENABLE = yes