diff --git a/java_console/tools/src/com/irnems/Test.java b/java_console/tools/src/com/irnems/Test.java
deleted file mode 100644
index 2b9b98ed66..0000000000
--- a/java_console/tools/src/com/irnems/Test.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.irnems;
-
-import jssc.SerialPortList;
-
-/**
- * Date: 12/25/12
- * (c) Andrey Belomutskiy
- */
-public class Test {
-
-    public static void main(String[] args) {
-        String[] portNames = SerialPortList.getPortNames();
-        System.out.println("Total " + portNames.length + " serial port(s)");
-        for (String portName : portNames) {
-            System.out.println(portName);
-        }
-        System.exit(0);
-    }
-}
diff --git a/java_console/ui/src/com/rusefi/logic/IgnitionMapBuilder.java b/java_console/ui/src/com/rusefi/logic/IgnitionMapBuilder.java
new file mode 100644
index 0000000000..162b600360
--- /dev/null
+++ b/java_console/ui/src/com/rusefi/logic/IgnitionMapBuilder.java
@@ -0,0 +1,30 @@
+package com.rusefi.logic;
+
+/**
+ * (c) Andrey Belomutskiy 2012-2015
+ * 12/24/2015
+ */
+public class IgnitionMapBuilder {
+
+    public enum ChamberStyle {
+        OPEN_CHAMBER(33),
+        CLOSED_CHAMBER(28),
+        SWITL_TUMBLE(22);
+
+
+        private final int advance;
+
+        ChamberStyle(int advance) {
+            this.advance = advance;
+        }
+
+        public int getAdvance() {
+            return advance;
+        }
+    }
+
+
+    public static double getTopAdvanceForBore(ChamberStyle style) {
+        return style.advance;
+    }
+}
diff --git a/java_console/ui/src/com/rusefi/logic/test/IgnitionMapBuilderTest.java b/java_console/ui/src/com/rusefi/logic/test/IgnitionMapBuilderTest.java
new file mode 100644
index 0000000000..deb7046d3c
--- /dev/null
+++ b/java_console/ui/src/com/rusefi/logic/test/IgnitionMapBuilderTest.java
@@ -0,0 +1,19 @@
+package com.rusefi.logic.test;
+
+import com.rusefi.logic.IgnitionMapBuilder;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * (c) Andrey Belomutskiy 2012-2015
+ * 12/24/2015
+ */
+public class IgnitionMapBuilderTest {
+    @Test
+    public void testIgnitionMapBuilder() {
+        assertEquals(33.0, IgnitionMapBuilder.getTopAdvanceForBore(IgnitionMapBuilder.ChamberStyle.OPEN_CHAMBER));
+
+        assertEquals(22.0, IgnitionMapBuilder.getTopAdvanceForBore(IgnitionMapBuilder.ChamberStyle.SWITL_TUMBLE));
+    }
+}