diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
new file mode 100644
index 000000000..6e19eeddd
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Mad Noodle (Jesse Leventhal)
+
+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 0xFEED
+#define PRODUCT_ID 0x1701
+#define DEVICE_VER 0x0002
+#define MANUFACTURER The Mad Noodle
+#define PRODUCT NCC1701KB v2
+#define DESCRIPTION NCC1701KB v2 macro keypad
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 3
+
+/* NCC-1701-KB PCB default pin-out */
+#define MATRIX_ROW_PINS { D4, D6, D7 }
+#define MATRIX_COL_PINS { B4, B5, B6 }
+#define UNUSED_PINS
+
+/* RGB BackLight */
+#define RGB_DI_PIN B7
+#define RGBLED_NUM 4
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+/*Encoders */
+#define ENCODERS_PAD_A { D0 }
+#define ENCODERS_PAD_B { D1 }
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
new file mode 100644
index 000000000..b0b82d532
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -0,0 +1,22 @@
+{
+ "keyboard_name": "NCC-1701-KB v2",
+ "url": "instagram.com/the_mad_noodle",
+ "maintainer": "The-Mad-Noodle",
+ "width": 3,
+ "height": 3,
+ "layouts": {
+ "LAYOUT_ortho_3x3": {
+ "layout": [
+ {"x":0, "y":0},
+ {"label":"Encoder", "x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
new file mode 100644
index 000000000..486db5070
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
@@ -0,0 +1,83 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ /* LAYER 0
+ * ,-----------------------.
+ * | << | MUTE | >> | ENCODER - PRESS (MUTE) / HOLD (LAYER 2) / KNOB (VOLUME CONTROL)
+ * |-------+-------+-------|
+ * | STOP | PLAY | MEDIA |
+ * |-------+-------+-------|
+ * | CALC | MAIL | PC/FN |
+ * `-----------------------'
+ */
+
+ [0] = LAYOUT_ortho_3x3(
+ KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
+ KC_MSTP, KC_MPLY, KC_MSEL,
+ KC_CALC, KC_MAIL, LT(1, KC_MYCM)
+ ),
+
+
+ /* LAYER 1
+ * ,-----------------------.
+ * | MODE+ |RGB TOG| MODE- | ENCODER - PRESS (NA) / KNOB (Hue Control)
+ * |-------+-------+-------|
+ * | SPD- | SPD+ |Bright |
+ * |-------+-------+-------|
+ * | SAT+ | SAT- | |
+ * `-----------------------'
+ */
+
+ [1] = LAYOUT_ortho_3x3(
+ RGB_MOD, RGB_TOG, RGB_RMOD,
+ RGB_SPI, RGB_SPD, RGB_VAI,
+ RGB_SAI, RGB_SAD, KC_TRNS
+ ),
+
+
+ /* LAYER 2 (ENCODER)
+ * ,-----------------------.
+ * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right)
+ * |-------+-------+-------|
+ * | | | |
+ * |-------+-------+-------|
+ * | | | |
+ * `-----------------------'
+ */
+
+ [2] = LAYOUT_ortho_3x3(
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+ )
+
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+
+ switch (get_highest_layer(layer_state)) {
+ case 1:
+ if (clockwise) {
+ rgblight_increase_hue();
+ } else {
+ rgblight_decrease_hue();
+ }
+ break;
+ case 2:
+ if (clockwise) {
+ tap_code(KC_RGHT);
+ } else {
+ tap_code(KC_LEFT);
+ }
+ break;
+ default:
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ break;
+
+ }
+}
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/readme.md b/keyboards/themadnoodle/ncc1701kb/v2/readme.md
new file mode 100644
index 000000000..4e70dd342
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/readme.md
@@ -0,0 +1,17 @@
+# NCC-1701-KB v2 Keypad with Encoder
+
+![NCC-1701-KB V2 TOP](https://static.wixstatic.com/media/59d0ff_e9812deb74a4408ca77599a19a8f93b6~mv2.jpg)
+![NCC-1701-KB V2 RGB](https://static.wixstatic.com/media/59d0ff_7a8968b70ed849a591664332964cc936~mv2.jpg)
+
+The NCC-1701-KB v2 by The Mad Noodle Prototypes is a custom Star Trek inspired 3x3 mechanical keypad with an encoder knob and full RGB Underglow.
+
+* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NCC-1701-KB v2 PCB, ATmega32U4
+* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make themadnoodle/ncc1701kb/v2: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/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
new file mode 100644
index 000000000..960f1d7a6
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+# Teensy halfkay
+# Pro Micro caterina
+# Atmel DFU atmel-dfu
+# LUFA DFU lufa-dfu
+# QMK DFU qmk-dfu
+# ATmega32A bootloadHID
+# ATmega328P USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # 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 = no # 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 = yes # Enable keyboard RGB underglow
+MIDI_ENABLE = no # MIDI controls
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODE_ENABLE = yes # Unicode
+API_SYSEX_ENABLE = yes
+TAP_DANCE_ENABLE = no
+ENCODER_ENABLE = yes
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.c b/keyboards/themadnoodle/ncc1701kb/v2/v2.c
new file mode 100644
index 000000000..caf7c6f0f
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/v2.c
@@ -0,0 +1 @@
+#include "v2.h"
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.h b/keyboards/themadnoodle/ncc1701kb/v2/v2.h
new file mode 100644
index 000000000..5d3b65be5
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/v2.h
@@ -0,0 +1,32 @@
+/* Copyright 2020 The Mad Noodle (Jesse Leventhal)
+ *
+ * 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_ortho_3x3( \
+ k00, k01, k02, \
+ k10, k11, k12, \
+ k20, k21, k22 \
+) \
+{ \
+ { k00, k01, k02 }, \
+ { k10, k11, k12 }, \
+ { k20, k21, k22 } \
+}
+
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
new file mode 100644
index 000000000..0b1d723e0
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Mad Noodle (Jesse Leventhal)
+
+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 0xFEED
+#define PRODUCT_ID 0x1701
+#define DEVICE_VER 0x0001
+#define MANUFACTURER The Mad Noodle
+#define PRODUCT Noodle Pad v1
+#define DESCRIPTION Noodle Pad macro keypad
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 3
+
+/* NCC-1701-KB PCB default pin-out */
+#define MATRIX_ROW_PINS { D4, D6, D7 }
+#define MATRIX_COL_PINS { B4, B5, B6 }
+#define UNUSED_PINS
+
+/* RGB BackLight */
+#define RGB_DI_PIN B7
+#define RGBLED_NUM 4
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+/*Encoders */
+#define ENCODERS_PAD_A { D0 }
+#define ENCODERS_PAD_B { D1 }
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
new file mode 100644
index 000000000..9e75cb635
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -0,0 +1,22 @@
+{
+ "keyboard_name": "NoodlePad",
+ "url": "instagram.com/the_mad_noodle",
+ "maintainer": "The-Mad-Noodle",
+ "width": 3,
+ "height": 3,
+ "layouts": {
+ "LAYOUT_ortho_3x3": {
+ "layout": [
+ {"x":0, "y":0},
+ {"label":"Encoder", "x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c
new file mode 100644
index 000000000..e487c2726
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c
@@ -0,0 +1,83 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ /* LAYER 0
+ * ,-----------------------.
+ * | << | MUTE | >> | ENCODER - PRESS (MUTE) / KNOB (VOLUME CONTROL)
+ * |-------+-------+-------|
+ * | STOP | PLAY | MEDIA |
+ * |-------+-------+-------|
+ * | CALC | MAIL | PC/FN |
+ * `-----------------------'
+ */
+
+ [0] = LAYOUT_ortho_3x3(
+ KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
+ KC_MSTP, KC_MPLY, KC_MSEL,
+ KC_CALC, KC_MAIL, LT(1, KC_MYCM)
+ ),
+
+
+ /* LAYER 1
+ * ,-----------------------.
+ * | MODE+ |RGB TOG| MODE- | ENCODER - PRESS (NA) / KNOB (Hue Control)
+ * |-------+-------+-------|
+ * | SPD- | SPD+ |Bright |
+ * |-------+-------+-------|
+ * | SAT+ | SAT- | |
+ * `-----------------------'
+ */
+
+ [1] = LAYOUT_ortho_3x3(
+ RGB_MOD, RGB_TOG, RGB_RMOD,
+ RGB_SPI, RGB_SPD, RGB_VAI,
+ RGB_SAI, RGB_SAD, KC_TRNS
+ ),
+
+
+ /* LAYER 2 (ENCODER)
+ * ,-----------------------.
+ * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right)
+ * |-------+-------+-------|
+ * | | | |
+ * |-------+-------+-------|
+ * | | | |
+ * `-----------------------'
+ */
+
+ [2] = LAYOUT_ortho_3x3(
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+ )
+
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+
+ switch (get_highest_layer(layer_state)) {
+ case 1:
+ if (clockwise) {
+ rgblight_increase_hue();
+ } else {
+ rgblight_decrease_hue();
+ }
+ break;
+ case 2:
+ if (clockwise) {
+ tap_code(KC_RGHT);
+ } else {
+ tap_code(KC_LEFT);
+ }
+ break;
+ default:
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ break;
+
+ }
+}
diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.c b/keyboards/themadnoodle/noodlepad/noodlepad.c
new file mode 100644
index 000000000..afabf7862
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/noodlepad.c
@@ -0,0 +1 @@
+#include "noodlepad.h"
diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.h b/keyboards/themadnoodle/noodlepad/noodlepad.h
new file mode 100644
index 000000000..e1aa5d2a6
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/noodlepad.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 The Mad Noodle (Jesse Leventhal)
+ *
+ * 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_ortho_3x3( \
+ k00, k01, k02, \
+ k10, k11, k12, \
+ k20, k21, k22 \
+) \
+{ \
+ { k00, k01, k02 }, \
+ { k10, k11, k12 }, \
+ { k20, k21, k22 } \
+}
diff --git a/keyboards/themadnoodle/noodlepad/readme.md b/keyboards/themadnoodle/noodlepad/readme.md
new file mode 100644
index 000000000..e4439dac4
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/readme.md
@@ -0,0 +1,17 @@
+# Noodle Pad v1 Keypad with Encoder
+
+![NoodlePad TOP](https://static.wixstatic.com/media/59d0ff_052f27ee5ae84266821af7277c51c4ed~mv2.jpg)
+![NoodlePad RGB](https://static.wixstatic.com/media/59d0ff_c91f2adc258547a38cc5b480a8d9c510~mv2.jpg)
+
+The Noodle Pad by The Mad Noodle Prototypes is a custom 3x3 mechanical keypad with an encoder knob and full RGB Underglow.
+
+* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NoodlePad PCB, ATmega32U4
+* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make themadnoodle/noodlepad: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/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk
new file mode 100644
index 000000000..960f1d7a6
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+# Teensy halfkay
+# Pro Micro caterina
+# Atmel DFU atmel-dfu
+# LUFA DFU lufa-dfu
+# QMK DFU qmk-dfu
+# ATmega32A bootloadHID
+# ATmega328P USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # 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 = no # 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 = yes # Enable keyboard RGB underglow
+MIDI_ENABLE = no # MIDI controls
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODE_ENABLE = yes # Unicode
+API_SYSEX_ENABLE = yes
+TAP_DANCE_ENABLE = no
+ENCODER_ENABLE = yes