diff --git a/keyboards/nyquist/keymaps/danielhklein/config.h b/keyboards/nyquist/keymaps/danielhklein/config.h
new file mode 100644
index 000000000..7ed90b6cd
--- /dev/null
+++ b/keyboards/nyquist/keymaps/danielhklein/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2017 James Morgan <ja.morgan1@outlook.com>
+
+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/>.
+*/
+
+
+#define TAPPING_TERM 150
+#define USE_SERIAL
+#define EE_HANDS
+
+#ifdef SUBPROJECT_rev1
+ #include "../../rev1/config.h"
+#endif
diff --git a/keyboards/nyquist/keymaps/danielhklein/keymap.c b/keyboards/nyquist/keymaps/danielhklein/keymap.c
new file mode 100644
index 000000000..1eae967b9
--- /dev/null
+++ b/keyboards/nyquist/keymaps/danielhklein/keymap.c
@@ -0,0 +1,148 @@
+#include "nyquist.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+
+/*
+ Keymap is loosely based on DivergeJM's Nyquist keymap
+ Major changes made:
+ - DVORAK, COLEMAK, FUNCTION, MOUSE, and ADJUST layers have been removed
+ - right 2u key performs backspace, not enter
+ - no right ctrl key
+ - direction keys added to bottom row
+ - LOWER layer controls function keys, media controls, and underglow
+*/
+extern keymap_config_t keymap_config;
+
+enum custom_layers {
+ _QWERTY,
+ _LOWER,
+ _RAISE
+};
+
+enum custom_keycodes {
+ QWERTY = SAFE_RANGE,
+ LOWER,
+ RAISE
+};
+
+ // Enable these functions using FUNC(n) macro.
+ const uint16_t PROGMEM fn_actions[] = { //ACTION_LAYER_TAP_TOGGLE requires that number of taps be defined in *config.h* - default set to 5
+ [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), //Hold for momentary Lower layer, Tap for Space,
+ [1] = ACTION_LAYER_TAP_KEY(_RAISE, KC_BSPC) //Hold for momentary Raise layer, Tap for Backspace,
+ };
+
+#define SPC_LWR FUNC(0)
+#define BSP_RSE FUNC(1)
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+// Underglow setup
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * .----------------------------------------. .-----------------------------------------.
+ * | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | [ |
+ * |-----+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Tab | Q | W | E | R | T | | Y | U | I | O | P | ] |
+ * |-----+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Caps| A | S | D | F | G | | H | J | K | L | ; | " |
+ * |-----+------+------+------+------+------| |------+------+------+------+------+------|
+ * |Lshft| Z | X | C | V | B | | N | M | , | . | / |Enter |
+ * |-----+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | Ctrl | LAlt | LGui | Bspc/Raise | | Spc/Lower | Left | Down | Up |Right |
+ * `----------------------------------------' '-----------------------------------------'
+ */
+
+[_QWERTY] = KEYMAP(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRACKET, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRACKET, \
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \
+ XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, BSP_RSE, BSP_RSE, SPC_LWR, SPC_LWR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
+ ),
+
+/* Raise
+ * ,-----------------------------------------. .-----------------------------------------.
+ * | | | | | | | | = | / | * | - | \ | Del |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | | | 7 | 8 | 9 | + | ` | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | | | 4 | 5 | 6 | Enter| | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Lshft| | | | | | | 1 | 2 | 3 | Space| | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | Bspc/Raise | | 0 | . | Bspc | | |
+ * `-----------------------------------------' `-----------------------------------------'
+ */
+
+[_RAISE] = KEYMAP( \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PEQL, KC_PSLS, KC_PAST, KC_MINS, KC_BSLS, KC_DEL, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7, KC_8, KC_9, KC_PPLS, KC_GRV, XXXXXXX,\
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_4, KC_5, KC_6, KC_PENT, XXXXXXX, XXXXXXX,\
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_SPC, XXXXXXX, XXXXXXX,\
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_0, KC_0, KC_DOT, KC_BSPC, XXXXXXX, XXXXXXX \
+),
+
+/* Lower
+ * ,-----------------------------------------. .-----------------------------------------.
+ * | F1 | F2 | F3 | F4 | F5 | F6 | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | F7 | F8 | F9 | F10 | F11 | F12 | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | >/|| | Mute | Vol- | Vol+ | |<< | >>| | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * |RGB IO|RGB >>|RGB <<|Hue++ |Hue-- | | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * |Sat++ |Sat-- |Val++ |Val-- | | | Spc/Lower | | | | |
+ * `-----------------------------------------' `-----------------------------------------'
+*/
+
+[_LOWER] = KEYMAP( \
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+ KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+ RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+ RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+ ),
+
+};
+
+void persistent_default_layer_set(uint16_t default_layer) {
+ eeconfig_update_default_layer(default_layer);
+ default_layer_set(default_layer);
+}
+
+/* Cases to switch default layer to QWERTY, COLEMAK or DVORAK
+ and to access ADJUST layer to access the switch keys */
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case QWERTY:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_QWERTY);
+ }
+ return false;
+ break;
+ case LOWER:
+ if (record->event.pressed) {
+ layer_on(_LOWER);
+ } else {
+ layer_off(_LOWER);
+ }
+ return false;
+ break;
+ case RAISE:
+ if (record->event.pressed) {
+ layer_on(_RAISE);
+ } else {
+ layer_off(_RAISE);
+ }
+ return false;
+ break;
+ }
+ return true;
+}
diff --git a/keyboards/nyquist/keymaps/danielhklein/rules.mk b/keyboards/nyquist/keymaps/danielhklein/rules.mk
new file mode 100644
index 000000000..ba799d47f
--- /dev/null
+++ b/keyboards/nyquist/keymaps/danielhklein/rules.mk
@@ -0,0 +1,34 @@
+# Copyright 2017 James Morgan <ja.morgan1@outlook.com>
+#
+# 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/>.
+
+
+# QMK Build Options
+# change to "no" to disable the options, or define them in the Makefile in
+# the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+COMMAND_ENABLE = yes # Commands for debug and configuration
+NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = no # Enable Tap Dance