diff --git a/keyboard/gherkin_outrigger/Makefile b/keyboard/gherkin_outrigger/Makefile
new file mode 100644
index 00000000..fd1b1004
--- /dev/null
+++ b/keyboard/gherkin_outrigger/Makefile
@@ -0,0 +1,136 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device.
+#                Please customize your programmer settings(PROGRAM_CMD)
+#
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+#            have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+#             have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+#               (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+#                (must have Atmel FLIP installed).
+#
+# make debug = Start either simulavr or avarice as specified for debugging, 
+#              with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+#                   bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+# Target file name (without extension).
+TARGET = gherkin_outrigger
+
+# Directory common source filess exist
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+TARGET_DIR = .
+
+# project specific files
+SRC =   matrix.c \
+        led.c \
+        backlight.c
+
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := actionmap_gherkin.c $(SRC)
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name
+#MCU = at90usb1287
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   comment out to disable the options.
+#
+ACTIONMAP_ENABLE = yes	# Use 16bit action codes in keymap instead of 8bit keycodes
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = yes	# Console for debug(+400)
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
+BACKLIGHT_ENABLE = yes
+
+# Optimize size but this may cause error "relocation truncated to fit"
+#EXTRALDFLAGS = -Wl,--relax
+
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TMK_DIR)
+
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
diff --git a/keyboard/gherkin_outrigger/actionmap_common.h b/keyboard/gherkin_outrigger/actionmap_common.h
new file mode 100644
index 00000000..614213a9
--- /dev/null
+++ b/keyboard/gherkin_outrigger/actionmap_common.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.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/>.
+*/
+#ifndef ACTIONMAP_COMMON_H
+#define ACTIONMAP_COMMON_H
+
+
+/* keymap definition macro */
+
+#define ACTIONMAP( \
+    K00, K01, K02, K03, K04, K05, K10, K11, K12, K13, \
+    K14, K15, K20, K21, K22, K23, K24, K25, K30, K31, \
+    K32, K33, K34, K35, K40, K41, K42, K43, K44, K45, \
+	K06, K16, K26, K36 \
+) { \
+	{ AC_##K00, AC_##K01, AC_##K02, AC_##K03, AC_##K04, AC_##K05, AC_##K06 }, \
+    { AC_##K10, AC_##K11, AC_##K12, AC_##K13, AC_##K14, AC_##K15, AC_##K16 }, \
+    { AC_##K20, AC_##K21, AC_##K22, AC_##K23, AC_##K24, AC_##K25, AC_##K26 }, \
+    { AC_##K30, AC_##K31, AC_##K32, AC_##K33, AC_##K34, AC_##K35, AC_##K36 }, \
+    { AC_##K40, AC_##K41, AC_##K42, AC_##K43, AC_##K44, AC_##K45 } \
+}
+#endif
diff --git a/keyboard/gherkin_outrigger/actionmap_gherkin.c b/keyboard/gherkin_outrigger/actionmap_gherkin.c
new file mode 100644
index 00000000..b7720c2e
--- /dev/null
+++ b/keyboard/gherkin_outrigger/actionmap_gherkin.c
@@ -0,0 +1,17 @@
+#include "actionmap.h"
+#include "action_code.h"
+#include "actionmap_common.h"
+
+
+/*
+ * Actions
+ */
+
+const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = ACTIONMAP( \
+	1,      2,      3,      4,      5,      6,      7,      8,      9,      0, \
+	Q,      W,      E,      R,      T,      U,      I,      O,      P,      LBRC,\
+	A,      S,      D,      F,      G,      J,      K,      L,      SCLN,   QUOT,\
+							C,      V,      N,      M ),
+
+};
diff --git a/keyboard/gherkin_outrigger/backlight.c b/keyboard/gherkin_outrigger/backlight.c
new file mode 100644
index 00000000..3bbf96c0
--- /dev/null
+++ b/keyboard/gherkin_outrigger/backlight.c
@@ -0,0 +1,54 @@
+// http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
+#include <avr/io.h>
+#include "backlight.h"
+
+#define FET OCR1A
+
+uint8_t led_counter = 0;
+uint8_t led_level = 0;
+
+
+void backlight_init_ports()
+{
+    DDRB |= (1<<5);
+    PORTB &= ~(1<<5);
+
+    TCCR1A = _BV(COM1A1) | _BV(WGM11); // = 0b10000010;
+    TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
+
+    ICR1 = 0xFFFF;
+
+    FET = 0x0000;
+
+    backlight_init();
+}
+
+void backlight_set(uint8_t level)
+{
+    if ( level == 0 )
+    {
+        // Turn off PWM control on PB5, revert to output low.
+        TCCR1A &= ~(_BV(COM1A1));
+        FET = 0x0000;
+        // Prevent backlight blink on lowest level
+        PORTB &= ~(_BV(PORTB5));
+    }
+    else if ( level == BACKLIGHT_LEVELS )
+    {
+        // Prevent backlight blink on lowest level
+        PORTB &= ~(_BV(PORTB5));
+        // Turn on PWM control of PB5
+        TCCR1A |= _BV(COM1A1);
+        // Set the brightness
+        FET = 0xFFFF;
+    }
+    else        
+    {
+        // Prevent backlight blink on lowest level
+        PORTB &= ~(_BV(PORTB5));
+        // Turn on PWM control of PB5
+        TCCR1A |= _BV(COM1A1);
+        // Set the brightness
+        FET = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2));
+    }
+}
\ No newline at end of file
diff --git a/keyboard/gherkin_outrigger/config.h b/keyboard/gherkin_outrigger/config.h
new file mode 100644
index 00000000..e70c6430
--- /dev/null
+++ b/keyboard/gherkin_outrigger/config.h
@@ -0,0 +1,74 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.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/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0A0C
+#define DEVICE_VER      0x0072
+#define MANUFACTURER    di0ib
+#define PRODUCT         The gherkin outrigger Keyboard
+#define DESCRIPTION     A 34 key keyboard
+
+/* Bootmagic */
+#define BOOTMAGIC_KEY_SALT KC_Q
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 7
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+ 
+/* number of backlight levels */
+#define BACKLIGHT_LEVELS 4
+
+/* 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
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#endif
diff --git a/keyboard/gherkin_outrigger/led.c b/keyboard/gherkin_outrigger/led.c
new file mode 100644
index 00000000..9458c038
--- /dev/null
+++ b/keyboard/gherkin_outrigger/led.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.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/>.
+*/
+
+#include <avr/io.h>
+#include "stdint.h"
+#include "led.h"
+
+
+void led_set(uint8_t usb_led)
+{
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        // output low
+        DDRB |= (1<<0);
+        PORTB &= ~(1<<0);
+        DDRD |= (1<<5);
+        PORTD &= ~(1<<5);
+    } else {
+        // Hi-Z
+        DDRB &= ~(1<<0);
+        PORTB &= ~(1<<0);
+        DDRD &= ~(1<<5);
+        PORTD &= ~(1<<5);
+    }
+}
diff --git a/keyboard/gherkin_outrigger/matrix.c b/keyboard/gherkin_outrigger/matrix.c
new file mode 100644
index 00000000..f4b993be
--- /dev/null
+++ b/keyboard/gherkin_outrigger/matrix.c
@@ -0,0 +1,216 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.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/>.
+*/
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <util/delay.h>
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "matrix.h"
+
+#ifndef DEBOUNCE
+#   define DEBOUNCE	5
+#endif
+static uint8_t debouncing = DEBOUNCE;
+
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
+
+static matrix_row_t read_cols(void);
+static void init_cols(void);
+static void unselect_rows(void);
+static void select_row(uint8_t row);
+
+
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
+void matrix_init(void)
+{
+    // To use PORTF disable JTAG with writing JTD bit twice within four cycles.
+    MCUCR |= (1<<JTD);
+    MCUCR |= (1<<JTD);
+
+    backlight_init_ports();
+
+    // initialize row and col
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+}
+
+uint8_t matrix_scan(void)
+{
+
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        select_row(i);
+        _delay_us(30);  // without this wait read unstable value.
+        matrix_row_t cols = read_cols();
+        if (matrix_debouncing[i] != cols) {
+            matrix_debouncing[i] = cols;
+            if (debouncing) {
+                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+            }
+            debouncing = DEBOUNCE;
+        }
+        unselect_rows();
+    }
+
+    if (debouncing) {
+        if (--debouncing) {
+            _delay_ms(1);
+        } else {
+            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+                matrix[i] = matrix_debouncing[i];
+            }
+        }
+    }
+
+    return 1;
+}
+
+bool matrix_is_modified(void)
+{
+    if (debouncing) return false;
+    return true;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & ((matrix_row_t)1<<col));
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    return matrix[row];
+}
+
+void matrix_print(void)
+{
+    print("\nr/c 0123456789ABCDEF\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        phex(row); print(": ");
+        pbin_reverse16(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += bitpop16(matrix[i]);
+    }
+    return count;
+}
+
+/* Column pin configuration
+ * col: 0   1   2   3   4   5   6
+ * pin: D0, D4, C6, D7, E6, B4, F6
+ */
+ 
+static void  init_cols(void)
+{
+    // Input with pull-up(DDR:0, PORT:1)
+    DDRD  &= ~(1<<0 | 1<<4 | 1<<7 );
+    PORTD |=  (1<<0 | 1<<4 | 1<<7 );
+    DDRB  &= ~(1<<4);
+    PORTB |=  (1<<4);
+    DDRC  &= ~(1<<6);
+    PORTC |=  (1<<6);
+    DDRE  &= ~(1<<6);
+    PORTE |=  (1<<6);
+    DDRF  &= ~(1<<6);
+    PORTF |=  (1<<6);
+}
+
+static matrix_row_t read_cols(void)
+{
+//LED on Bottom of switch
+    return (PIND&(1<<0) ? 0 : (1<<0)) |
+           (PIND&(1<<4) ? 0 : (1<<1)) |
+           (PINC&(1<<6) ? 0 : (1<<2)) |
+           (PIND&(1<<7) ? 0 : (1<<3)) |
+           (PINE&(1<<6) ? 0 : (1<<4)) |
+           (PINB&(1<<4) ? 0 : (1<<5)) |
+           (PINF&(1<<6) ? 0 : (1<<6));
+}
+
+/* Row pin configuration
+ * row: 0   1   2   3   4 
+ * pin: B6, B2, B3, B1, F7
+ */
+ 
+static void unselect_rows(void)
+{
+    // Hi-Z(DDR:0, PORT:0) to unselect
+    DDRF  &= ~0b10000000;
+    PORTF &= ~0b10000000;
+	DDRB  &= ~0b01001110;
+    PORTB &= ~0b01001110;
+}
+
+static void select_row(uint8_t row)
+{
+    // Output low(DDR:1, PORT:0) to select
+//LED on Bottom of switch
+    switch (row) {
+        case 0:
+            DDRB  |= (1<<6);
+            PORTB &= ~(1<<6);
+            break;
+        case 1:
+            DDRB  |= (1<<2);
+            PORTB &= ~(1<<2);
+            break;
+        case 2:
+            DDRB  |= (1<<3);
+            PORTB &= ~(1<<3);
+            break;
+        case 3:
+            DDRB  |= (1<<1);
+            PORTB &= ~(1<<1);
+            break;
+        case 4:
+            DDRF  |= (1<<7);
+            PORTF &= ~(1<<7);
+            break;
+    }
+
+}
diff --git a/keyboard/gherkin_outrigger/readme.md b/keyboard/gherkin_outrigger/readme.md
new file mode 100644
index 00000000..9bb66bba
--- /dev/null
+++ b/keyboard/gherkin_outrigger/readme.md
@@ -0,0 +1,11 @@
+## gherkin keyboard firmware
+
+======================
+gherkin outrigger keyboard. 7x5 matrix.
+
+
+Pinout
+
+	col: D0, D4, C6, D7, E6, B4, F6
+    row: B6, B2, B3, B1, F7
+