diff --git a/atmega32/gherkin32/Makefile b/atmega32/gherkin32/Makefile
new file mode 100644
index 0000000..c4034e4
--- /dev/null
+++ b/atmega32/gherkin32/Makefile
@@ -0,0 +1,148 @@
+# Target file name (without extension).
+TARGET ?= gherkin32
+
+# Directory common source filess exist
+TMK_DIR ?= ../../tmk_core
+
+# Directory keyboard dependent files exist
+TARGET_DIR ?= .
+
+# project specific files
+SRC ?=	keymap_gherkin.c \
+	matrix.c \
+	led.c
+
+CONFIG_H ?= config.h
+
+
+# MCU name
+MCU ?= atmega32
+
+# Defines needed to use correct registers for the atmega32
+OPT_DEFS += -DNO_CLKPR -DTIMER0_COMP -DTIMER_PRESCALER=1024
+
+# 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
+
+# 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
+BOOTLOADER_SIZE ?= 2048
+OPT_DEFS += -DBOOTLOADER_SIZE=$(BOOTLOADER_SIZE)
+
+
+# Build Options
+#   comment out to disable the options.
+#
+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 ?= no	# Console for debug disabled, disables also UART RX
+COMMAND_ENABLE ?= yes	# Commands for debug and configuration
+SLEEP_LED_ENABLE ?= no	# Breathing sleep LED during USB suspend
+NKRO_ENABLE ?= no	# USB Nkey Rollover
+ACTIONMAP_ENABLE ?= no	# Use 16bit action codes in keymap instead of 8bit keycodes
+NO_UART = yes 		# UART for debugging
+
+
+# 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.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/protocol/vusb.mk
+include $(TMK_DIR)/rules.mk
+
+
+#---------------- Programming Options (avrdude) ----------------
+
+AVRDUDE ?= avrdude
+
+# Programming hardware, type: avrdude -c ?
+# to get a full listing.
+#
+# This setting asumes, that you flashed the bootloader first
+AVRDUDE_PROGRAMMER ?= usbasp
+
+# com1 = serial port. Use lpt1 to connect to parallel port.
+AVRDUDE_PORT ?=  /dev/ttyACM0   # programmer connected to serial device
+
+AVRDUDE_WRITE_FLASH ?= -U flash:w:$(TARGET).hex
+#AVRDUDE_WRITE_EEPROM ?= -U eeprom:w:$(TARGET).eep
+
+# Brown-out detection level at VCC=2.7 V; [BODLEVEL=1]
+# Ext. Crystal Osc.; High Frequency; Start-up time PWRDWN/RESET: 1024 clk + 64 ms; [CKSEL=1111 SUT=00]
+# Boot Reset vector Enabled (Jump to bootloader first)
+# Serial program downloading (SPI) enabled; [SPIEN=0]
+# Watch-dog Timer disabled; [WDTON=0]
+# Self Programming disabled; [SELFPRGEN=0]
+AVRDUDE_FUSEBITS ?= -U lfuse:w:0x8F:m -U hfuse:w:0xC8:m
+
+
+# Uncomment the following if you want avrdude's erase cycle counter.
+# Note that this counter needs to be initialized first using -Yn,
+# see avrdude manual.
+#AVRDUDE_ERASE_COUNTER ?= -y
+
+# Uncomment the following if you do /not/ wish a verification to be
+# performed after programming the device.
+#AVRDUDE_NO_VERIFY ?= -V
+
+# Increase verbosity level.  Please use this when submitting bug
+# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
+# to submit bug reports.
+#AVRDUDE_VERBOSE ?= -v -v
+
+AVRDUDE_FLAGS ?= -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
+AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
+AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
+
+#============================================================================
+
+# Program the device.
+program: $(TARGET).hex $(TARGET).eep
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) $(AVRDUDE_FUSEBITS)
+
+# Set fuses.
+fuse:
+	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_FUSEBITS)
+
+# Listing of phony targets.
+.PHONY : all sizebefore sizeafter gccversion \
+build elf hex eep lss sym coff extcoff \
+clean program fuse
diff --git a/atmega32/gherkin32/keymap_common.h b/atmega32/gherkin32/keymap_common.h
new file mode 100644
index 0000000..a51f3be
--- /dev/null
+++ b/atmega32/gherkin32/keymap_common.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 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 KEYMAP_COMMON_H
+#define KEYMAP_COMMON_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "keycode.h"
+#include "action.h"
+#include "action_macro.h"
+#include "report.h"
+#include "host.h"
+#include "print.h"
+#include "debug.h"
+#include "keymap.h"
+
+
+#define KEYMAP( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 \
+) \
+{ \
+    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, \
+      KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, \
+      KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29 } \
+}
+
+#endif
diff --git a/atmega32/gherkin32/keymap_gherkin.c b/atmega32/gherkin32/keymap_gherkin.c
new file mode 100644
index 0000000..f471499
--- /dev/null
+++ b/atmega32/gherkin32/keymap_gherkin.c
@@ -0,0 +1,74 @@
+#include "keymap_common.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+KEYMAP(
+    Q,      W,      E,      R,      T,      Y,      U,      I,      O,      P, \
+    A,      S,      D,      F,      G,      H,      J,      K,      L,      ESC, \
+    FN6,    FN7,    FN2,    FN3,    FN4,    FN8,    FN10,   FN1,    FN0,    FN5
+),
+
+KEYMAP(
+    1,      2,      3,      4,      5,      6,      7,      8,      9,      0, \
+    F1,     F2,     F3,     F4,     F5,     F6,     F7,     F8,     F9,     F10, \
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   DEL,    TRNS,   TRNS
+),
+
+KEYMAP(
+    FN11,   FN12,   FN13,   FN14,   FN15,   FN16,   FN17,   FN18,   FN19,   FN20, \
+    F11,    F12,    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   GRV, \
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS
+),
+
+KEYMAP(
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   MINS,   EQL,    LBRC,   RBRC,   BSLS, \
+    TAB,    TRNS,   CAPS,   TRNS,   TRNS,   COMM,   DOT,    SLSH,   SCLN,   QUOT, \
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   LEFT,   DOWN,   UP,     RGHT
+),
+
+KEYMAP(
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   FN21,   FN22,   FN23,   FN24,   FN25, \
+    TAB,    TRNS,   CAPS,   TRNS,   TRNS,   FN26,   FN27,   FN28,   FN29,   FN30, \
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   HOME,   PGDN,   PGUP,   END
+),
+
+KEYMAP(
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   PSCR, \
+    TRNS,   TRNS,   CAPS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS, \
+    TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS
+),
+};
+
+const action_t PROGMEM fn_actions[] = {
+	[0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
+	[1] = ACTION_LAYER_TAP_KEY(2, KC_BSPACE),
+	[2] = ACTION_LAYER_TAP_KEY(3, KC_C),
+	[3] = ACTION_LAYER_TAP_KEY(4, KC_V),
+	[4] = ACTION_LAYER_TAP_KEY(5, KC_B),
+	[5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT),
+	[6] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_Z),
+	[7] = ACTION_MODS_TAP_KEY(MOD_LALT, KC_X),
+	[8] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_N),
+	[10] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_M),
+	[11] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
+	[12] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
+	[13] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
+	[14] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
+	[15] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
+	[16] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
+	[17] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
+	[18] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
+	[19] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
+	[20] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
+	[21] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
+	[22] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
+	[23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
+	[24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
+	[25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
+	[26] = ACTION_MODS_KEY(MOD_LSFT, KC_COMM),
+	[27] = ACTION_MODS_KEY(MOD_LSFT, KC_DOT),
+	[28] = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH),
+	[29] = ACTION_MODS_KEY(MOD_LSFT, KC_SCLN),
+	[30] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT),
+};
+
diff --git a/atmega32/gherkin32/led.c b/atmega32/gherkin32/led.c
new file mode 100644
index 0000000..58ef4eb
--- /dev/null
+++ b/atmega32/gherkin32/led.c
@@ -0,0 +1,26 @@
+/*
+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)
+{
+
+}
diff --git a/atmega32/gherkin32/matrix.c b/atmega32/gherkin32/matrix.c
new file mode 100644
index 0000000..b6bf5cd
--- /dev/null
+++ b/atmega32/gherkin32/matrix.c
@@ -0,0 +1,203 @@
+/*
+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)
+{
+    // 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   7   8   9   10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25  26  27  28  29
+ * pin: B0, B2, B4, B6, D0, D3, D6, C0, C2, C4, B1, B3, B5, B7, D1, D5, D7, C1, C3, C5, A0, A1, A2, A3, A4, A5, A6, A7, C7, C6
+ */
+ 
+static void  init_cols(void)
+{
+    // Input with pull-up(DDR:0, PORT:1)
+    DDRA  &= ~0b11111111;
+    PORTA |=  0b11111111;
+    DDRB  &= ~0b11111111;
+    PORTB |=  0b11111111;
+    DDRC  &= ~0b11111111;
+    PORTC |=  0b11111111;
+    DDRD  &= ~0b11101011;
+    PORTD |=  0b11101011;
+}
+
+static matrix_row_t read_cols(void)
+{
+    return 
+	(PINB&(1<<0) ? 0 : (1UL<<0)) |
+	(PINB&(1<<2) ? 0 : (1UL<<1)) |
+	(PINB&(1<<4) ? 0 : (1UL<<2)) |
+	(PINB&(1<<6) ? 0 : (1UL<<3)) |
+	(PIND&(1<<0) ? 0 : (1UL<<4)) |
+	(PIND&(1<<3) ? 0 : (1UL<<5)) |
+	(PIND&(1<<6) ? 0 : (1UL<<6)) |
+	(PINC&(1<<0) ? 0 : (1UL<<7)) |
+	(PINC&(1<<2) ? 0 : (1UL<<8)) |
+	(PINC&(1<<4) ? 0 : (1UL<<9)) |
+	(PINB&(1<<1) ? 0 : (1UL<<10)) |
+	(PINB&(1<<3) ? 0 : (1UL<<11)) |
+	(PINB&(1<<5) ? 0 : (1UL<<12)) |
+	(PINB&(1<<7) ? 0 : (1UL<<13)) |
+	(PIND&(1<<1) ? 0 : (1UL<<14)) |
+	(PIND&(1<<5) ? 0 : (1UL<<15)) |
+	(PIND&(1<<7) ? 0 : (1UL<<16)) |
+	(PINC&(1<<1) ? 0 : (1UL<<17)) |
+	(PINC&(1<<3) ? 0 : (1UL<<18)) |
+	(PINC&(1<<5) ? 0 : (1UL<<19)) |
+	(PINA&(1<<0) ? 0 : (1UL<<20)) |
+	(PINA&(1<<1) ? 0 : (1UL<<21)) |
+	(PINA&(1<<2) ? 0 : (1UL<<22)) |
+	(PINA&(1<<3) ? 0 : (1UL<<23)) |
+	(PINA&(1<<4) ? 0 : (1UL<<24)) |
+	(PINA&(1<<5) ? 0 : (1UL<<25)) |
+	(PINA&(1<<6) ? 0 : (1UL<<26)) |
+	(PINA&(1<<7) ? 0 : (1UL<<27)) |
+	(PINC&(1<<7) ? 0 : (1UL<<28)) |
+	(PINC&(1<<6) ? 0 : (1UL<<29));
+}
+
+/* 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
+}
+
+static void select_row(uint8_t row)
+{
+    // Output low(DDR:1, PORT:0) to select
+}