diff --git a/build.xml b/build.xml
index 7334c5a..c3ba54e 100644
--- a/build.xml
+++ b/build.xml
@@ -9,6 +9,7 @@
   <property name="project.dest" value="${project.dir}/out/production/clojure-plugin"/>
   <property name="test.dest" value="${project.dir}/out/test/clojure-plugin"/>
   <property name="test.dist" value="${project.dir}/test_dist"/>
+  <property name="main.dist" value="${project.dir}/dist"/>
   <property name="idea.pack" value="${project.dir}/idea_pack"/>
   <property name="tools.jar.dir" value="${java.home}/lib"/>
 
@@ -48,6 +49,9 @@
     <fileset dir="${clojure.lib}">
       <include name="clojure.jar"/>
     </fileset>
+    <fileset dir="${project.lib}">
+      <include name="*.jar"/>
+    </fileset>
     <fileset dir="${clojure.contrib}">
       <include name="clojure-contrib.jar"/>
     </fileset>
@@ -89,6 +93,10 @@
     <delete dir="build" includes="**/*"/>
   </target>
 
+  <taskdef resource="scala/tools/ant/antlib.xml">
+    <classpath refid="base.path"/>
+  </taskdef>
+
   <target name="make.lexer">
     <java jar="${project.lib}/JFlex.jar" output="jflex.log" fork="true" maxmemory="512m">
       <arg value="--charat"/>
@@ -98,7 +106,18 @@
     </java>
   </target>
 
-  <target name="make.java" depends="make.lexer, unzip.last.successful.IDEA.build">
+  <target name="make.scala" depends="make.lexer, unzip.last.successful.IDEA.build">
+    <scalac destdir="${project.dest}" 
+	    srcdir="${project.dir}">
+      <classpath>
+	<path refid="base.path"/>
+      </classpath>
+      <include name="src/**/*.scala"/>
+      <include name="src/**/*.java"/>
+    </scalac>
+  </target>
+
+  <target name="make.java" depends="make.scala">
     <!-- Read SINCE and UNTIL properties -->
     <loadfile property="idea.build" srcFile="${idea.home}/build.txt" failonerror="true"/>
     <!--Copy descriptor-->
@@ -116,7 +135,7 @@
           tofile="${project.dest}/org/jetbrains/plugins/clojure/ClojureBundle.properties"/>
 
     <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="idea.classpath"/>
-
+   
     <!--Compile project Java files-->
     <javac2 srcdir="${project.dir}"
             destdir="${project.dest}"
@@ -161,6 +180,9 @@
     </jar>
 
     <copy todir="${project.dir}/tempjar/clojure-plugin/lib">
+      <fileset dir="${project.lib}">
+        <include name="scala-library.jar"/>
+      </fileset>
       <fileset dir="${clojure.lib}">
         <include name="clojure.jar"/>
       </fileset>
@@ -169,13 +191,13 @@
       </fileset>
     </copy>
 
-    <mkdir dir="${test.dist}"/>
+    <mkdir dir="${main.dist}"/>
 
-    <zip destfile="${test.dist}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
+    <zip destfile="${main.dist}/clojure-intellij-bin-${plugin.version}.zip" basedir="${project.dir}/tempjar"/>
     <delete dir="${project.dir}/tempjar"/>
 
     <!-- Zip sources-->
-    <zip destfile="${test.dist}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
+    <zip destfile="${main.dist}/clojure-intellij-src-${plugin.version}.zip" basedir="${project.dir}"
          includes="src/**/*.java,
          src/**/*.properties,
          src/**/*.flex,
@@ -214,7 +236,8 @@
   </target>
 
   <target name="run.tests" depends="build.tests">
-
+    
+     <mkdir dir="${test.dist}"/>
     <mkdir dir="${project.dir}/logs"/>
     <mkdir dir="${test.dist}/config"/>
     <mkdir dir="${test.dist}/system"/>
diff --git a/clojure-intellij-plugin.ipr b/clojure-intellij-plugin.ipr
index a288d93..78795a7 100644
--- a/clojure-intellij-plugin.ipr
+++ b/clojure-intellij-plugin.ipr
@@ -321,6 +321,23 @@
         <root url="file://$PROJECT_DIR$/../../enclojure/org-enclojure-repl-client/src/main/java" />
       </SOURCES>
     </library>
+    <library name="scala.sdk">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/scala-compiler.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/scala-library.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/lib/scala-library-src.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="scalatest">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/scalatest-1.2.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
   </component>
 </project>
 
diff --git a/clojure-plugin.iml b/clojure-plugin.iml
index 750e946..7e8374b 100644
--- a/clojure-plugin.iml
+++ b/clojure-plugin.iml
@@ -5,6 +5,12 @@
     <facet type="Clojure" name="Clojure">
       <configuration />
     </facet>
+    <facet type="scala" name="Scala">
+      <configuration>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="scala.sdk" />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
@@ -27,6 +33,8 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="scala.sdk" level="project" />
+    <orderEntry type="library" name="scalatest" level="project" />
   </component>
 </module>
 
diff --git a/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java b/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
index 0985caa..624930a 100644
--- a/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
+++ b/src/org/jetbrains/plugins/clojure/lexer/_ClojureLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 12/15/10 5:38 PM */
+/* The following code was generated by JFlex 1.4.1 on 12/15/10 7:01 PM */
 
 /*
  * Copyright 2000-2009 Red Shark Technology
@@ -27,7 +27,7 @@
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.1
- * on 12/15/10 5:38 PM from the specification file
+ * on 12/15/10 7:01 PM from the specification file
  * <tt>src/org/jetbrains/plugins/clojure/lexer/clojure.flex</tt>
  */
 public class _ClojureLexer implements ClojureTokenTypes, FlexLexer {
diff --git a/src/org/jetbrains/plugins/clojure/parameterInfo/ClojureParameterInfoHandler.scala b/src/org/jetbrains/plugins/clojure/parameterInfo/ClojureParameterInfoHandler.scala
new file mode 100644
index 0000000..4be0213
--- /dev/null
+++ b/src/org/jetbrains/plugins/clojure/parameterInfo/ClojureParameterInfoHandler.scala
@@ -0,0 +1,13 @@
+package org.jetbrains.plugins.clojure.parameterInfo
+
+import com.intellij.lang.parameterInfo.ParameterInfoHandlerWithTabActionSupport
+import org.jetbrains.plugins.clojure.psi.api.ClList
+import org.jetbrains.plugins.clojure.psi.api.symbols.ClSymbol
+
+/**
+ * @author ilyas
+ */
+
+abstract class ClojureParameterInfoHandler extends ParameterInfoHandlerWithTabActionSupport[ClList, Any, ClSymbol] {
+
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.java b/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.java
deleted file mode 100644
index bd85756..0000000
--- a/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jetbrains.plugins.clojure.psi.impl.symbols;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.plugins.clojure.ClojureIcons;
-import org.jetbrains.plugins.clojure.psi.api.ClList;
-import org.jetbrains.plugins.clojure.psi.api.symbols.ClSymbol;
-
-import javax.swing.*;
-
-import static org.jetbrains.plugins.clojure.psi.impl.list.ListDeclarations.*;
-
-/**
- * @author ilyas
- */
-public class SymbolUtils {
-
-
-  public static Icon getIcon(ClSymbol symbol, int flags) {
-    final PsiElement parent = PsiTreeUtil.getParentOfType(symbol, ClList.class);
-    if (parent instanceof ClList) {
-      ClList list = (ClList) parent;
-
-      // Functions and defs
-      if (symbol == list.getSecondNonLeafElement()) {
-        final PsiElement fst = list.getFirstNonLeafElement();
-        if (fst instanceof ClSymbol) {
-          ClSymbol lstSym = (ClSymbol) fst;
-          final String nameString = lstSym.getNameString();
-
-          if (FN.equals(nameString)) return ClojureIcons.FUNCTION;
-          if (DEFN.equals(nameString) || DEFN_.equals(nameString)) return ClojureIcons.FUNCTION;
-        }
-      }
-
-
-    }
-
-    return null;
-  }
-}
diff --git a/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.scala b/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.scala
new file mode 100644
index 0000000..fffab07
--- /dev/null
+++ b/src/org/jetbrains/plugins/clojure/psi/impl/symbols/SymbolUtils.scala
@@ -0,0 +1,37 @@
+package org.jetbrains.plugins.clojure.psi.impl.symbols
+
+/**
+ * @author ilyas
+ */
+
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.plugins.clojure.ClojureIcons
+import org.jetbrains.plugins.clojure.psi.api.ClList
+import org.jetbrains.plugins.clojure.psi.api.symbols.ClSymbol
+import org.jetbrains.plugins.clojure.psi.impl.list.ListDeclarations
+
+import javax.swing._
+
+/**
+ * @author ilyas
+ */
+
+object SymbolUtils {
+
+  def getIcon(symbol: ClSymbol, flags: Int): Icon =
+    PsiTreeUtil.getParentOfType(symbol, classOf[ClList]) match {
+      case list: ClList if symbol == list.getSecondNonLeafElement() =>
+        list.getFirstNonLeafElement() match {
+          case lstSym: ClSymbol => {
+            lstSym.getNameString() match {
+              case ListDeclarations.FN => ClojureIcons.FUNCTION
+              case ListDeclarations.DEFN | ListDeclarations.DEFN_ => ClojureIcons.FUNCTION
+              case _ => null
+            }
+          }
+          case _ => null
+        }
+      case _ => null
+    }
+
+}