diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 07c4a12e6cc..835a0ad7a54 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,27 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="AnalysisUIOptions">
-    <option name="SCOPE_TYPE" value="4" />
-  </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\declarations\DeclarationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationContext.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\declarations\DeclarationVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\src\org\jetbrains\k2js\declarations\Declarations.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../WebView/.idea/misc.xml" afterPath="$PROJECT_DIR$/../WebView/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../WebView/.idea/workspace.xml" afterPath="$PROJECT_DIR$/../WebView/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../java-compatibility/.idea/misc.xml" afterPath="$PROJECT_DIR$/../java-compatibility/.idea/misc.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/IntrinsicDeclarationVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/IntrinsicDeclarationVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" />
     </list>
     <ignored path="k2js.iws" />
@@ -107,7 +116,46 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" line="71" class="org.jetbrains.k2js.translate.reference.ReferenceTranslator" package="org.jetbrains.k2js.translate.reference">
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" line="2" class="PropertyTranslator.java" package="">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" line="40" class="org.jetbrains.k2js.translate.reference.ReferenceTranslator" package="org.jetbrains.k2js.translate.reference">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" line="56" class="org.jetbrains.k2js.translate.reference.ReferenceTranslator" package="org.jetbrains.k2js.translate.reference">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" line="107" class="org.jetbrains.k2js.translate.context.TranslationContext" package="org.jetbrains.k2js.translate.context">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -177,76 +225,67 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.6412811">
+    <splitter split-orientation="horizontal" split-proportion="0.38007116">
       <split-first>
         <leaf>
-          <file leaf-file-name="CompareToTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java">
+          <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="87" column="24" selection-start="3829" selection-end="3829" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="false" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="BinaryOperationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="75" column="24" selection-start="3358" selection-end="3358" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="false" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="TraitTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TraitTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="22" column="16" selection-start="442" selection-end="442" vertical-scroll-proportion="0.0">
+                <state line="100" column="63" selection-start="3755" selection-end="3755" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="OperatorTable.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java">
+          <file leaf-file-name="DeclarationBodyVisitor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="57" column="0" selection-start="2773" selection-end="2773" vertical-scroll-proportion="0.0">
+                <state line="19" column="19" selection-start="662" selection-end="662" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Intrinsics.java" pinned="false" current="true" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java">
+          <file leaf-file-name="TranslationTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="48" column="40" selection-start="1854" selection-end="1854" vertical-scroll-proportion="0.6350461">
-                  <folding>
-                    <element signature="e#953#990#0" expanded="true" />
-                    <element signature="e#1116#1156#0" expanded="true" />
-                  </folding>
+                <state line="2" column="25" selection-start="59" selection-end="59" vertical-scroll-proportion="0.0">
+                  <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Intrinsic.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java">
+          <file leaf-file-name="TemporaryVariable.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="12" column="4" selection-start="303" selection-end="303" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
+                <state line="29" column="13" selection-start="880" selection-end="880" vertical-scroll-proportion="0.0">
+                  <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="EqualsIntrinsic.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java">
+          <file leaf-file-name="NamingScope.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="7" column="59" selection-start="184" selection-end="184" vertical-scroll-proportion="0.0">
+                <state line="72" column="48" selection-start="2197" selection-end="2197" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DynamicContext.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="49" column="48" selection-start="1709" selection-end="1709" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="Translation.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="98" column="57" selection-start="5018" selection-end="5018" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -270,11 +309,13 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="UnaryOperationIntrinsic.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java">
+          <file leaf-file-name="DescriptorUtils.java" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="15" column="45" selection-start="551" selection-end="551" vertical-scroll-proportion="0.0">
-                  <folding />
+                <state line="13" column="52" selection-start="492" selection-end="492" vertical-scroll-proportion="0.110032365">
+                  <folding>
+                    <element signature="e#2087#2110#0" expanded="true" />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -283,91 +324,91 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="postfixOnProperty.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/operatorOverloading/out/postfixOnProperty.js">
+          <file leaf-file-name="DeclarationVisitor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="62" column="53" selection-start="2604" selection-end="2604" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="postfixOnProperty.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt">
+          <file leaf-file-name="ReferenceTranslator.java" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="40" column="0" selection-start="1492" selection-end="1492" vertical-scroll-proportion="0.33333334">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="minusAssignOnProperty.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/intrinsic/cases/minusAssignOnProperty.kt">
+          <file leaf-file-name="JetType.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="9" column="96" selection-start="78" selection-end="78" vertical-scroll-proportion="0.0">
+                <state line="17" column="9" selection-start="445" selection-end="445" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="IntrinsicTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/IntrinsicTest.java">
+          <file leaf-file-name="ClassDescriptorImpl.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="22" column="16" selection-start="430" selection-end="430" vertical-scroll-proportion="0.0">
+                <state line="112" column="54" selection-start="4625" selection-end="4625" vertical-scroll-proportion="-18.307692">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="minusAssignOnProperty.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/intrinsic/out/minusAssignOnProperty.js">
+          <file leaf-file-name="JetScope.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="25" column="21" selection-start="738" selection-end="738" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="namespacePropertyInitializer.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/out/namespacePropertyInitializer.js">
+          <file leaf-file-name="DescriptorUtils.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="17" column="13" selection-start="504" selection-end="504" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="PropertyTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java">
+          <file leaf-file-name="NamespaceDescriptor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="106" column="64" selection-start="3980" selection-end="3980" vertical-scroll-proportion="0.0">
+                <state line="10" column="72" selection-start="359" selection-end="359" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="namespaceCustomAccessors.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/out/namespaceCustomAccessors.js">
+          <file leaf-file-name="DeclarationDescriptor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="10" column="59" selection-start="336" selection-end="336" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="plusAssign.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/intrinsic/out/plusAssign.js">
+          <file leaf-file-name="Named.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Named.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="7" column="17" selection-start="133" selection-end="133" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="TranslationUtils.java" pinned="false" current="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
+          <file leaf-file-name="Annotated.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="219" column="44" selection-start="10071" selection-end="10071" vertical-scroll-proportion="1.0934718">
+                <state line="7" column="17" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -394,22 +435,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/intrinsic/out/plusAssign.js" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/DeclarationContext.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" />
       </list>
     </option>
   </component>
@@ -499,7 +540,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
           <PATH>
@@ -514,6 +554,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -560,7 +601,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
+              <option name="myItemId" value="trait" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -578,37 +619,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="intrinsic" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="out" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="intrinsic" />
+              <option name="myItemId" value="trait" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -616,6 +627,64 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="operatorOverloading" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="operatorOverloading" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -692,7 +761,33 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="intrinsic" />
+              <option name="myItemId" value="declaration" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translate" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="context" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -761,7 +856,7 @@
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="recentsLimit" value="5" />
     <property name="MemberChooser.sorted" value="false" />
-    <property name="options.lastSelected" value="reference.settingsdialog.IDE.editor.colors.Java" />
+    <property name="options.lastSelected" value="preferences.pluginManager" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
@@ -789,92 +884,6 @@
     </key>
   </component>
   <component name="RunManager" selected="JUnit.All in jetTests">
-    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" />
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="All in translator" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.translate.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Cover" />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Cover" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="BasicClassTest.constructorWithPropertiesAsParameters" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.BasicClassTest" />
-      <option name="METHOD_NAME" value="constructorWithPropertiesAsParameters" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <dir value="$PROJECT_DIR$/translator" />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Debug" />
-      <method />
-    </configuration>
     <configuration default="false" name="IntrinsicTest.intrinsicPlusAssign" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -923,6 +932,95 @@
       </JSDebuggerConfigurationSettings>
       <method />
     </configuration>
+    <configuration default="false" name="TraitTest.traitAddsFunctionsToClass" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="jetTests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.TraitTest" />
+      <option name="METHOD_NAME" value="traitAddsFunctionsToClass" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="TraitTest.classDerivesFromClassAndTrait" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.translate.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.TraitTest" />
+      <option name="METHOD_NAME" value="classDerivesFromClassAndTrait" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" />
+      <module name="jetTests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -1044,11 +1142,11 @@
     </configuration>
     <list size="6">
       <item index="0" class="java.lang.String" itemvalue="JUnit.tests" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.All in translator" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.BasicClassTest.constructorWithPropertiesAsParameters" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.IntrinsicTest.intrinsicPlusAssign" />
-      <item index="5" class="java.lang.String" itemvalue="JavaScript Debug.compareTo.js" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.IntrinsicTest.intrinsicPlusAssign" />
+      <item index="2" class="java.lang.String" itemvalue="JavaScript Debug.compareTo.js" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TraitTest.traitAddsFunctionsToClass" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TraitTest.classDerivesFromClassAndTrait" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -1116,16 +1214,16 @@
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.6705091" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32854405" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22382325" sideWeight="0.45750934" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22382325" sideWeight="0.45750934" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.49812934" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756963" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.284342" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.728146" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24906467" sideWeight="0.77617675" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30067244" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24906467" sideWeight="0.6993276" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30067244" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3275862" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3994253" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -1213,125 +1311,116 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/AssignmentTranslator.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="0" selection-start="1559" selection-end="1559" vertical-scroll-proportion="0.0">
+        <state line="13" column="16" selection-start="397" selection-end="397" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IntrinsicAssignmentTranslator.java">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="19" selection-start="788" selection-end="788" vertical-scroll-proportion="0.0">
+        <state line="100" column="63" selection-start="3755" selection-end="3755" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="25" column="105" selection-start="1428" selection-end="1428" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="19" column="19" selection-start="662" selection-end="662" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="112" column="54" selection-start="4625" selection-end="4625" vertical-scroll-proportion="-18.307692">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="17" column="9" selection-start="445" selection-end="445" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="25" column="21" selection-start="738" selection-end="738" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="17" column="13" selection-start="504" selection-end="504" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="17" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Named.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="17" selection-start="133" selection-end="133" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="59" selection-start="336" selection-end="336" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="72" selection-start="359" selection-end="359" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/ast/JsProgram.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="82" column="17" selection-start="2414" selection-end="2414" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="62" column="53" selection-start="2604" selection-end="2604" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="40" column="0" selection-start="1492" selection-end="1492" vertical-scroll-proportion="0.33333334">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="52" selection-start="492" selection-end="492" vertical-scroll-proportion="0.110032365">
           <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="28" selection-start="2498" selection-end="2498" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="0" selection-start="366" selection-end="366" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/IntrinsicDeclarationVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="19" selection-start="445" selection-end="445" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/FunctionIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="61" selection-start="335" selection-end="335" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/EqualsIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="59" selection-start="184" selection-end="184" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/UnaryOperationIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="45" selection-start="551" selection-end="551" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="4" selection-start="303" selection-end="303" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/CompareToTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="87" column="24" selection-start="3829" selection-end="3829" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="75" column="24" selection-start="3358" selection-end="3358" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TraitTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="16" selection-start="442" selection-end="442" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperatorTable.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="0" selection-start="2773" selection-end="2773" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/CompareToIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="62" selection-start="297" selection-end="297" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/BinaryOperationIntrinsic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="15" column="13" selection-start="520" selection-end="520" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="40" selection-start="1854" selection-end="1854" vertical-scroll-proportion="0.6350461">
-          <folding>
-            <element signature="e#953#990#0" expanded="true" />
-            <element signature="e#1116#1156#0" expanded="true" />
+            <element signature="e#2087#2110#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/translator/src/org/jetbrains/k2js/declarations/DeclarationContext.java b/translator/src/org/jetbrains/k2js/translate/context/DeclarationContext.java
similarity index 64%
rename from translator/src/org/jetbrains/k2js/declarations/DeclarationContext.java
rename to translator/src/org/jetbrains/k2js/translate/context/DeclarationContext.java
index d553d21a74c..ab4f8b25c4f 100644
--- a/translator/src/org/jetbrains/k2js/declarations/DeclarationContext.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/DeclarationContext.java
@@ -1,8 +1,7 @@
-package org.jetbrains.k2js.declarations;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -10,23 +9,23 @@ import org.jetbrains.annotations.Nullable;
 public final class DeclarationContext {
 
     @NotNull
-    public static DeclarationContext rootContext(@NotNull JsScope scope, @Nullable JsNameRef qualifier) {
+    public static DeclarationContext rootContext(@NotNull NamingScope scope, @Nullable JsNameRef qualifier) {
         return new DeclarationContext(scope, qualifier);
     }
 
     @NotNull
-    private final JsScope scope;
+    private final NamingScope scope;
 
     @Nullable
     private final JsNameRef qualifier;
 
-    private DeclarationContext(@NotNull JsScope scope, @Nullable JsNameRef qualifier) {
+    private DeclarationContext(@NotNull NamingScope scope, @Nullable JsNameRef qualifier) {
         this.scope = scope;
         this.qualifier = qualifier;
     }
 
     @NotNull
-    public JsScope getScope() {
+    public NamingScope getScope() {
         return scope;
     }
 
@@ -36,7 +35,7 @@ public final class DeclarationContext {
     }
 
     @NotNull
-    public DeclarationContext innerDeclaration(@NotNull JsScope declarationScope, @NotNull JsName declarationName) {
+    public DeclarationContext innerDeclaration(@NotNull NamingScope declarationScope, @NotNull JsName declarationName) {
         JsNameRef reference = declarationName.makeRef();
         if (qualifier != null) {
             AstUtil.setQualifier(reference, qualifier);
diff --git a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java b/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java
similarity index 85%
rename from translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
rename to translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java
index 00fd0ec8e8d..9b27453b82c 100644
--- a/translator/src/org/jetbrains/k2js/declarations/DeclarationVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java
@@ -1,11 +1,11 @@
-package org.jetbrains.k2js.declarations;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.k2js.translate.context.Namer;
+
+import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getOwnDeclarations;
 
 /**
  * @author Talanov Pavel
@@ -22,22 +22,22 @@ public final class DeclarationVisitor extends DeclarationDescriptorVisitor<Void,
     @NotNull
     private DeclarationContext declareClass(@NotNull ClassDescriptor descriptor,
                                             @NotNull DeclarationContext context) {
-        JsScope classScope = declareScope(descriptor, context, "class " + descriptor.getName());
+        NamingScope classScope = declareScope(descriptor, context, "class " + descriptor.getName());
         JsName className = declareName(descriptor, context);
         return context.innerDeclaration(classScope, className);
     }
 
-    private JsScope declareScope(@NotNull DeclarationDescriptor descriptor, @NotNull DeclarationContext context,
-                                 @NotNull String scopeName) {
-        JsScope classScope = new JsScope(context.getScope(), scopeName);
-        declarations.putScope(descriptor, classScope);
-        return classScope;
+    private NamingScope declareScope(@NotNull DeclarationDescriptor descriptor, @NotNull DeclarationContext context,
+                                     @NotNull String scopeName) {
+        NamingScope innerScope = context.getScope().innerScope(scopeName);
+        declarations.putScope(descriptor, innerScope);
+        return innerScope;
     }
 
     @NotNull
     private JsName declareName(@NotNull DeclarationDescriptor descriptor, @NotNull DeclarationContext context,
                                @NotNull String name) {
-        JsName jsName = context.getScope().declareName(name);
+        JsName jsName = context.getScope().declareVariable(descriptor, name);
         declarations.putName(descriptor, jsName);
         declarations.putQualifier(descriptor, context.getQualifier());
         return jsName;
@@ -59,8 +59,7 @@ public final class DeclarationVisitor extends DeclarationDescriptorVisitor<Void,
     }
 
     private void declareClassMembers(@NotNull ClassDescriptor descriptor, @NotNull DeclarationContext context) {
-        for (DeclarationDescriptor memberDescriptor :
-                descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
+        for (DeclarationDescriptor memberDescriptor : getOwnDeclarations(descriptor)) {
             memberDescriptor.accept(this, context);
         }
     }
@@ -120,7 +119,7 @@ public final class DeclarationVisitor extends DeclarationDescriptorVisitor<Void,
     private DeclarationContext extractNamespaceDeclaration(@NotNull NamespaceDescriptor descriptor,
                                                            @NotNull DeclarationContext context) {
         JsName namespaceName = declareName(descriptor, context, nameForNamespace(descriptor));
-        JsScope namespaceScope = declareScope(descriptor, context, "namespace " + namespaceName.getIdent());
+        NamingScope namespaceScope = declareScope(descriptor, context, "namespace " + namespaceName.getIdent());
         return context.innerDeclaration(namespaceScope, namespaceName);
     }
 
diff --git a/translator/src/org/jetbrains/k2js/declarations/Declarations.java b/translator/src/org/jetbrains/k2js/translate/context/Declarations.java
similarity index 84%
rename from translator/src/org/jetbrains/k2js/declarations/Declarations.java
rename to translator/src/org/jetbrains/k2js/translate/context/Declarations.java
index 9ec819b75b5..a12b36d5e76 100644
--- a/translator/src/org/jetbrains/k2js/declarations/Declarations.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/Declarations.java
@@ -1,8 +1,7 @@
-package org.jetbrains.k2js.declarations;
+package org.jetbrains.k2js.translate.context;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
@@ -15,30 +14,31 @@ import java.util.Map;
  * @author Talanov Pavel
  */
 public final class Declarations {
+
+
     @NotNull
-    private final Map<DeclarationDescriptor, JsScope> descriptorToScopeMap = new HashMap<DeclarationDescriptor, JsScope>();
+    public static Declarations newInstance(@NotNull NamingScope rootScope) {
+        return new Declarations(rootScope);
+    }
+
+    @NotNull
+    private final Map<DeclarationDescriptor, NamingScope> descriptorToScopeMap = new HashMap<DeclarationDescriptor, NamingScope>();
     @NotNull
     private final Map<DeclarationDescriptor, JsName> descriptorToNameMap = new HashMap<DeclarationDescriptor, JsName>();
     @NotNull
     private final Map<DeclarationDescriptor, JsNameRef> descriptorToQualifierMap = new HashMap<DeclarationDescriptor, JsNameRef>();
     @NotNull
-    private final JsScope rootScope;
+    private final NamingScope rootScope;
 
-    private Declarations(@NotNull JsScope scope) {
+    private Declarations(@NotNull NamingScope scope) {
         this.rootScope = scope;
     }
 
-    @NotNull
-    static public Declarations newInstance(@NotNull JsScope rootScope) {
-        return new Declarations(rootScope);
-    }
-
     public void extractDeclarations(@NotNull DeclarationDescriptor descriptor) {
         DeclarationVisitor visitor = new DeclarationVisitor(this);
         descriptor.accept(visitor, DeclarationContext.rootContext(rootScope, null));
     }
 
-    //TODO: provide a mechanism to do intrinsics
     public void extractStandardLibrary(@NotNull JetStandardLibrary standardLibrary,
                                        @NotNull JsNameRef standardLibraryObjectName) {
         DeclarationVisitor visitor = new DeclarationVisitor(this);
@@ -50,8 +50,8 @@ public final class Declarations {
     }
 
     @NotNull
-    public JsScope getScope(@NotNull DeclarationDescriptor descriptor) {
-        JsScope scope = descriptorToScopeMap.get(descriptor.getOriginal());
+    public NamingScope getScope(@NotNull DeclarationDescriptor descriptor) {
+        NamingScope scope = descriptorToScopeMap.get(descriptor.getOriginal());
         assert scope != null : "Unknown declaration";
         return scope;
     }
@@ -78,7 +78,7 @@ public final class Declarations {
         return qualifier;
     }
 
-    /*package*/ void putScope(@NotNull DeclarationDescriptor descriptor, @NotNull JsScope scope) {
+    /*package*/ void putScope(@NotNull DeclarationDescriptor descriptor, @NotNull NamingScope scope) {
 //        assert !descriptorToScopeMap.containsKey(descriptor) : "Already contains that key!";
         descriptorToScopeMap.put(descriptor, scope);
     }
diff --git a/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java b/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java
new file mode 100644
index 00000000000..04e04bb228c
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java
@@ -0,0 +1,78 @@
+package org.jetbrains.k2js.translate.context;
+
+import com.google.dart.compiler.backend.js.ast.JsBlock;
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsName;
+import com.google.dart.compiler.backend.js.ast.JsScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+
+public class DynamicContext {
+
+    @NotNull
+    public static DynamicContext rootContext(@NotNull NamingScope rootScope, @NotNull JsBlock globalBlock) {
+        return new DynamicContext(rootScope, globalBlock);
+    }
+
+    @NotNull
+    public static DynamicContext contextWithScope(@NotNull NamingScope scope) {
+        return new DynamicContext(scope, new JsBlock());
+    }
+
+    @NotNull
+    private NamingScope namingScope;
+    @NotNull
+    private JsBlock currentBlock;
+
+    private DynamicContext(@NotNull NamingScope scope, @NotNull JsBlock block) {
+        this.namingScope = scope;
+        this.currentBlock = block;
+    }
+
+    @NotNull
+    public DynamicContext innerScope(@NotNull JsScope scope) {
+        return new DynamicContext(namingScope.innerScope(scope), currentBlock);
+    }
+
+    @NotNull
+    public DynamicContext innerBlock(@NotNull JsBlock block) {
+        return new DynamicContext(namingScope, block);
+    }
+
+    @NotNull
+    public JsName getLocalName(@NotNull DeclarationDescriptor descriptor) {
+        JsName name = namingScope.getName(descriptor);
+        assert name != null : descriptor.getName() + " is not declared. Use isDeclared to check.";
+        return name;
+    }
+
+    public boolean isDeclared(@NotNull DeclarationDescriptor descriptor) {
+        return namingScope.isDeclared(descriptor);
+    }
+
+    @NotNull
+    public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
+        return new TemporaryVariable(namingScope.declareTemporary(), initExpression);
+    }
+
+    @NotNull
+    public TemporaryVariable declareTemporaryWithName(@NotNull String preferredName,
+                                                      @NotNull JsExpression initExpression) {
+        return new TemporaryVariable(namingScope.declareTemporaryWithName(preferredName), initExpression);
+    }
+
+    @NotNull
+    public JsName declareLocalVariable(@NotNull DeclarationDescriptor descriptor) {
+        return namingScope.declareVariable(descriptor, descriptor.getName());
+    }
+
+    @NotNull
+    public JsScope jsScope() {
+        return namingScope.jsScope();
+    }
+
+    @NotNull
+    public JsBlock jsBlock() {
+        return currentBlock;
+    }
+}
\ No newline at end of file
diff --git a/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java b/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java
new file mode 100644
index 00000000000..4c75bcb0bd2
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java
@@ -0,0 +1,89 @@
+package org.jetbrains.k2js.translate.context;
+
+import com.google.dart.compiler.backend.js.ast.JsName;
+import com.google.dart.compiler.backend.js.ast.JsScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Talanov Pavel
+ */
+public final class NamingScope {
+
+    @NotNull
+    public static NamingScope rootScope(@NotNull JsScope rootScope) {
+        return new NamingScope(rootScope, null);
+    }
+
+    @NotNull
+    private final JsScope scope;
+
+    @Nullable
+    private final NamingScope parent;
+
+    @NotNull
+    private final Map<DeclarationDescriptor, JsName> descriptorToNameMap =
+            new HashMap<DeclarationDescriptor, JsName>();
+
+
+    private NamingScope(@NotNull JsScope correspondingScope, @Nullable NamingScope parent) {
+        this.scope = correspondingScope;
+        this.parent = parent;
+    }
+
+    @NotNull
+    public NamingScope innerScope(@NotNull String scopeName) {
+        JsScope innerJsScope = new JsScope(jsScope(), scopeName);
+        return new NamingScope(innerJsScope, this);
+    }
+
+    @NotNull
+    public NamingScope innerScope(@NotNull JsScope correspondingScope) {
+        return new NamingScope(correspondingScope, this);
+    }
+
+    @Nullable
+    public JsName getName(@NotNull DeclarationDescriptor descriptor) {
+        JsName name = descriptorToNameMap.get(descriptor);
+
+        if (name != null) return name;
+        if (parent != null) return parent.getName(descriptor);
+
+        return null;
+    }
+
+    @NotNull
+    public JsName declareVariable(@NotNull DeclarationDescriptor descriptor,
+                                  @NotNull String name) {
+        JsName declaredName = scope.declareName(name);
+        descriptorToNameMap.put(descriptor, declaredName);
+        return declaredName;
+    }
+
+    @NotNull
+    public JsName declareVariable(@NotNull DeclarationDescriptor descriptor) {
+        return declareVariable(descriptor, descriptor.getName());
+    }
+
+    public boolean isDeclared(@NotNull DeclarationDescriptor descriptor) {
+        return (getName(descriptor.getOriginal()) != null);
+    }
+
+    //TODO protect global namespace
+    public JsName declareTemporary() {
+        return scope.declareTemporary();
+    }
+
+    public JsName declareTemporaryWithName(@NotNull String preferredName) {
+        return scope.declareName(preferredName);
+    }
+
+    @NotNull
+    public JsScope jsScope() {
+        return scope;
+    }
+}
diff --git a/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
index edb2bc082ff..9ce4523fd44 100644
--- a/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
@@ -3,26 +3,26 @@ package org.jetbrains.k2js.translate.context;
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsProgram;
 import com.google.dart.compiler.backend.js.ast.JsRootScope;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
-import org.jetbrains.k2js.declarations.Declarations;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
+import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 public class StaticContext {
 
     public static StaticContext generateStaticContext(@NotNull JetStandardLibrary library,
                                                       @NotNull BindingContext bindingContext) {
         JsProgram program = new JsProgram("main");
-        JsRootScope rootScope = program.getRootScope();
-        Namer namer = Namer.newInstance(rootScope);
+        JsRootScope jsRootScope = program.getRootScope();
+        Namer namer = Namer.newInstance(jsRootScope);
         Aliaser aliaser = Aliaser.aliasesForStandardClasses(library, namer);
-        Declarations declarations = Declarations.newInstance(rootScope);
+        NamingScope scope = NamingScope.rootScope(jsRootScope);
+        Declarations declarations = Declarations.newInstance(scope);
         Intrinsics intrinsics = Intrinsics.standardLibraryIntrinsics(library);
-        return new StaticContext(program, bindingContext, declarations, aliaser, namer, intrinsics);
+        return new StaticContext(program, bindingContext, declarations, aliaser, namer, intrinsics, scope);
     }
 
     @NotNull
@@ -43,16 +43,21 @@ public class StaticContext {
     @NotNull
     private final Intrinsics intrinsics;
 
+    @NotNull
+    private final NamingScope rootScope;
+
 
     private StaticContext(@NotNull JsProgram program, @NotNull BindingContext bindingContext,
                           @NotNull Declarations declarations, @NotNull Aliaser aliaser,
-                          @NotNull Namer namer, @NotNull Intrinsics intrinsics) {
+                          @NotNull Namer namer, @NotNull Intrinsics intrinsics,
+                          @NotNull NamingScope rootScope) {
         this.program = program;
         this.bindingContext = bindingContext;
         this.declarations = declarations;
         this.aliaser = aliaser;
         this.namer = namer;
         this.intrinsics = intrinsics;
+        this.rootScope = rootScope;
     }
 
     @NotNull
@@ -86,34 +91,26 @@ public class StaticContext {
     }
 
     @NotNull
-    public JsScope getScopeForDescriptor(@NotNull DeclarationDescriptor descriptor) {
+    public NamingScope getRootScope() {
+        return rootScope;
+    }
+
+    @NotNull
+    public NamingScope getScopeForDescriptor(@NotNull DeclarationDescriptor descriptor) {
         return declarations.getScope(descriptor);
     }
 
     @NotNull
-    public JsScope getScopeForElement(@NotNull JetElement element) {
-        DeclarationDescriptor descriptor = getDescriptorForElement(element);
+    public NamingScope getScopeForElement(@NotNull JetElement element) {
+        DeclarationDescriptor descriptor = BindingUtils.getDescriptorForElement(bindingContext, element);
         return getScopeForDescriptor(descriptor);
     }
 
     @NotNull
-    public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) {
+    public JsName getGlobalName(@NotNull DeclarationDescriptor descriptor) {
         return declarations.getName(descriptor);
     }
 
-    @NotNull
-    public JsName getNameForElement(@NotNull JetElement element) {
-        DeclarationDescriptor descriptor = getDescriptorForElement(element);
-        return getNameForDescriptor(descriptor);
-    }
-
-    @NotNull
-    DeclarationDescriptor getDescriptorForElement(@NotNull JetElement element) {
-        DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
-        assert descriptor != null : "Element should have a descriptor";
-        return descriptor;
-    }
-
     public boolean isDeclared(@NotNull DeclarationDescriptor descriptor) {
         return declarations.hasDeclaredName(descriptor);
     }
diff --git a/translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java b/translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java
new file mode 100644
index 00000000000..59adc6780fc
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/context/TemporaryVariable.java
@@ -0,0 +1,38 @@
+package org.jetbrains.k2js.translate.context;
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsName;
+import com.google.dart.compiler.backend.js.ast.JsNameRef;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Talanov Pavel
+ */
+public final class TemporaryVariable {
+
+    @NotNull
+    private final JsExpression assignmentExpression;
+    @NotNull
+    private final JsName variableName;
+
+    /*package*/ TemporaryVariable(@NotNull JsName temporaryName, @NotNull JsExpression initExpression) {
+        this.variableName = temporaryName;
+        this.assignmentExpression = AstUtil.newAssignment(variableName.makeRef(), initExpression);
+    }
+
+    @NotNull
+    public JsNameRef nameReference() {
+        return variableName.makeRef();
+    }
+
+    @NotNull
+        /*package*/ JsName name() {
+        return variableName;
+    }
+
+    @NotNull
+    public JsExpression assignmentExpression() {
+        return assignmentExpression;
+    }
+}
\ No newline at end of file
diff --git a/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java b/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
index decd176d820..66be31bb674 100644
--- a/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java
@@ -1,13 +1,11 @@
 package org.jetbrains.k2js.translate.context;
 
-import com.google.dart.compiler.backend.js.ast.JsName;
-import com.google.dart.compiler.backend.js.ast.JsProgram;
-import com.google.dart.compiler.backend.js.ast.JsScope;
+import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.k2js.declarations.Declarations;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
 import org.jetbrains.k2js.translate.utils.BindingUtils;
 
@@ -16,90 +14,64 @@ import org.jetbrains.k2js.translate.utils.BindingUtils;
  */
 public final class TranslationContext {
 
-    private static class Scopes {
-        public Scopes(@NotNull JsScope enclosingScope, @NotNull JsScope functionScope, @NotNull JsScope namespaceScope) {
-            this.enclosingScope = enclosingScope;
-            this.classScope = functionScope;
-            this.namespaceScope = namespaceScope;
-        }
-
-        @NotNull
-        public final JsScope enclosingScope;
-        @NotNull
-        public final JsScope classScope;
-        @NotNull
-        public final JsScope namespaceScope;
-    }
-
     @NotNull
-    public static TranslationContext rootContext(@NotNull StaticContext staticContext) {
-        JsScope rootScope = staticContext.getProgram().getRootScope();
-        Scopes scopes = new Scopes(rootScope, rootScope, rootScope);
-        return new TranslationContext(staticContext, scopes);
-    }
-
-    @NotNull
-    private final Scopes scopes;
+    private final DynamicContext dynamicContext;
     @NotNull
     private final StaticContext staticContext;
 
+    @NotNull
+    public static TranslationContext rootContext(@NotNull StaticContext staticContext) {
+        JsProgram program = staticContext.getProgram();
+        JsBlock globalBlock = program.getGlobalBlock();
+        return new TranslationContext(staticContext,
+                DynamicContext.rootContext(staticContext.getRootScope(), globalBlock));
+    }
 
-    private TranslationContext(@NotNull StaticContext staticContext, @NotNull Scopes scopes) {
-        this.scopes = scopes;
+    private TranslationContext(@NotNull StaticContext staticContext, @NotNull DynamicContext dynamicContext) {
+        this.dynamicContext = dynamicContext;
         this.staticContext = staticContext;
     }
 
     @NotNull
-    public TranslationContext newNamespace(@NotNull JetNamespace declaration) {
-        return newNamespace(BindingUtils.getNamespaceDescriptor(staticContext.getBindingContext(), declaration));
-    }
-
-    @NotNull
-    public TranslationContext newNamespace(@NotNull NamespaceDescriptor descriptor) {
-        JsScope namespaceScope = staticContext.getDeclarations().getScope(descriptor);
-        Scopes newScopes = new Scopes(namespaceScope, namespaceScope, namespaceScope);
-        return new TranslationContext(staticContext, newScopes);
-    }
-
-    @NotNull
-    public TranslationContext newClass(@NotNull JetClass declaration) {
-        return newClass(BindingUtils.getClassDescriptor(staticContext.getBindingContext(), declaration));
-    }
-
-    @NotNull
-    public TranslationContext newClass(@NotNull ClassDescriptor descriptor) {
-        JsScope classScope = staticContext.getDeclarations().getScope(descriptor);
-        Scopes newScopes = new Scopes(classScope, classScope, scopes.namespaceScope);
-        return new TranslationContext(staticContext, newScopes);
-    }
-
-    @NotNull
-    public TranslationContext newPropertyAccess(@NotNull JetPropertyAccessor declaration) {
-        return newPropertyAccess(BindingUtils.getPropertyAccessorDescriptor(staticContext.getBindingContext(), declaration));
-    }
-
-    @NotNull
-    public TranslationContext newPropertyAccess(@NotNull PropertyAccessorDescriptor descriptor) {
-        return newFunctionDeclaration(descriptor);
-    }
-
-    @NotNull
-    public TranslationContext newFunctionDeclaration(@NotNull JetNamedFunction declaration) {
-        return newFunctionDeclaration(BindingUtils.getFunctionDescriptor(staticContext.getBindingContext(), declaration));
-    }
-
-    @NotNull
-    public TranslationContext newFunctionDeclaration(@NotNull FunctionDescriptor descriptor) {
-        JsScope functionScope = staticContext.getDeclarations().getScope(descriptor);
-        Scopes newScopes = new Scopes(functionScope, scopes.classScope, scopes.namespaceScope);
-        return new TranslationContext(staticContext, newScopes);
+    public TranslationContext contextWithScope(@NotNull NamingScope newScope) {
+        return new TranslationContext(staticContext, DynamicContext.contextWithScope(newScope));
     }
 
     // Note: Should be used if and only if scope has no corresponding descriptor
     @NotNull
-    public TranslationContext newEnclosingScope(@NotNull JsScope enclosingScope) {
-        Scopes newScopes = new Scopes(enclosingScope, scopes.classScope, scopes.namespaceScope);
-        return new TranslationContext(staticContext, newScopes);
+    public TranslationContext innerJsScope(@NotNull JsScope enclosingScope) {
+        return new TranslationContext(staticContext, dynamicContext.innerScope(enclosingScope));
+    }
+
+    @NotNull
+    public TranslationContext newNamespace(@NotNull JetNamespace declaration) {
+        return newDeclaration(BindingUtils.getNamespaceDescriptor(staticContext.getBindingContext(), declaration));
+    }
+
+    @NotNull
+    public TranslationContext newDeclaration(@NotNull DeclarationDescriptor descriptor) {
+        NamingScope declarationScope = staticContext.getDeclarations().getScope(descriptor);
+        return contextWithScope(declarationScope);
+    }
+
+    @NotNull
+    public TranslationContext newClass(@NotNull JetClass declaration) {
+        return newDeclaration(BindingUtils.getClassDescriptor(staticContext.getBindingContext(), declaration));
+    }
+
+    @NotNull
+    public TranslationContext newPropertyAccess(@NotNull JetPropertyAccessor declaration) {
+        return newDeclaration(BindingUtils.getPropertyAccessorDescriptor(staticContext.getBindingContext(), declaration));
+    }
+
+    @NotNull
+    public TranslationContext newPropertyAccess(@NotNull PropertyAccessorDescriptor descriptor) {
+        return newDeclaration(descriptor);
+    }
+
+    @NotNull
+    public TranslationContext newFunctionDeclaration(@NotNull JetNamedFunction declaration) {
+        return newDeclaration(BindingUtils.getFunctionDescriptor(staticContext.getBindingContext(), declaration));
     }
 
     @NotNull
@@ -107,54 +79,65 @@ public final class TranslationContext {
         return staticContext.getBindingContext();
     }
 
-    @NotNull
-    public JsProgram program() {
-        return staticContext.getProgram();
-    }
 
     @NotNull
-    public JsScope enclosingScope() {
-        return scopes.enclosingScope;
-    }
-
-    @NotNull
-    public JsScope namespaceScope() {
-        return scopes.namespaceScope;
-    }
-
-    @NotNull
-    public JsScope classScope() {
-        return scopes.classScope;
-    }
-
-
-    @NotNull
-    public JsScope getScopeForDescriptor(@NotNull DeclarationDescriptor descriptor) {
+    public NamingScope getScopeForDescriptor(@NotNull DeclarationDescriptor descriptor) {
         return staticContext.getScopeForDescriptor(descriptor);
     }
 
     @NotNull
-    public JsScope getScopeForElement(@NotNull JetElement element) {
+    public NamingScope getScopeForElement(@NotNull JetElement element) {
         return staticContext.getScopeForElement(element);
     }
 
     @NotNull
     public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) {
-        return staticContext.getNameForDescriptor(descriptor);
+        if (dynamicContext.isDeclared(descriptor)) {
+            return dynamicContext.getLocalName(descriptor);
+        }
+        return staticContext.getGlobalName(descriptor);
     }
 
     @NotNull
     public JsName getNameForElement(@NotNull JetElement element) {
-        return staticContext.getNameForElement(element);
-    }
-
-    @NotNull
-    private DeclarationDescriptor getDescriptorForElement(@NotNull JetElement element) {
-        return staticContext.getDescriptorForElement(element);
+        DeclarationDescriptor descriptor = BindingUtils.getDescriptorForElement(bindingContext(), element);
+        return getNameForDescriptor(descriptor);
     }
 
     public boolean isDeclared(@NotNull DeclarationDescriptor descriptor) {
-        return staticContext.isDeclared(descriptor);
+        if (dynamicContext.isDeclared(descriptor)) {
+            return true;
+        } else {
+            return staticContext.isDeclared(descriptor);
+        }
+    }
+
+    @NotNull
+    public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
+        return dynamicContext.declareTemporary(initExpression);
+    }
+
+    @NotNull
+    public JsName declareLocalVariable(@NotNull DeclarationDescriptor descriptor) {
+        return dynamicContext.declareLocalVariable(descriptor);
+    }
+
+    @NotNull
+    public JsName declareLocalVariable(@NotNull JetElement element) {
+        DeclarationDescriptor declarationDescriptor =
+                BindingUtils.getDescriptorForElement(bindingContext(), element);
+        return dynamicContext.declareLocalVariable(declarationDescriptor);
+    }
+
+    @NotNull
+    public TemporaryVariable newAliasForThis() {
+        TemporaryVariable aliasForThis = dynamicContext.declareTemporaryWithName("that", new JsThisRef());
+        aliaser().setAliasForThis(aliasForThis.name());
+        return aliasForThis;
+    }
+
+    public void removeAliasForThis() {
+        aliaser().removeAliasForThis();
     }
 
     @NotNull
@@ -176,4 +159,14 @@ public final class TranslationContext {
     public Intrinsics intrinsics() {
         return staticContext.getIntrinsics();
     }
+
+    @NotNull
+    public JsProgram program() {
+        return staticContext.getProgram();
+    }
+
+    @NotNull
+    public JsScope jsScope() {
+        return dynamicContext.jsScope();
+    }
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
index de3f1243dee..282648d18a1 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java
@@ -40,11 +40,11 @@ public final class ClassDeclarationTranslator extends AbstractTranslator {
         super(context);
         this.namespace = namespace;
         this.localToGlobalClassName = new HashMap<JsName, JsName>();
-        this.dummyFunctionScope = new JsScope(context().enclosingScope(), "class declaration function");
+        this.dummyFunctionScope = new JsScope(context().jsScope(), "class declaration function");
     }
 
     public void generateDeclarations() {
-        declarationsObject = context().enclosingScope().declareName(Namer.nameForClassesVariable());
+        declarationsObject = context().jsScope().declareName(Namer.nameForClassesVariable());
         assert declarationsObject != null;
         declarationsStatement =
                 AstUtil.newAssignmentStatement(declarationsObject.makeRef(), generateDummyFunctionInvocation());
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
index ed417846713..2d1c6110a11 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
@@ -20,6 +20,8 @@ import org.jetbrains.k2js.translate.utils.BindingUtils;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter;
+
 /**
  * @author Talanov Pavel
  */
@@ -127,7 +129,7 @@ public final class ClassTranslator extends AbstractTranslator {
         List<JsPropertyInitializer> result = new ArrayList<JsPropertyInitializer>();
         for (JetParameter parameter : classDeclaration.getPrimaryConstructorParameters()) {
             PropertyDescriptor descriptor =
-                    BindingUtils.getPropertyDescriptorForConstructorParameter(context().bindingContext(), parameter);
+                    getPropertyDescriptorForConstructorParameter(context().bindingContext(), parameter);
             if (descriptor != null) {
                 result.addAll(PropertyTranslator.translateAccessors(descriptor, context()));
             }
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
index 4a586c9f647..e918e50afa5 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
@@ -18,8 +18,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.assignmentToBackingFieldFromParameter;
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.backingFieldReference;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.*;
 
 /**
  * @author Talanov Pavel
@@ -105,8 +104,7 @@ public final class PropertyTranslator extends AbstractTranslator {
     @NotNull
     private JsFunction generateDefaultGetterFunction(@NotNull PropertyGetterDescriptor descriptor) {
         JsReturn returnExpression = new JsReturn(backingFieldReference(context(), property));
-        JsFunction getterFunction =
-                JsFunction.getAnonymousFunctionWithScope(context().getScopeForDescriptor(descriptor));
+        JsFunction getterFunction = functionWithScope(context().getScopeForDescriptor(descriptor));
         getterFunction.setBody(AstUtil.convertToBlock(returnExpression));
         return getterFunction;
     }
@@ -121,10 +119,9 @@ public final class PropertyTranslator extends AbstractTranslator {
 
     @NotNull
     private JsFunction generateDefaultSetterFunction(@NotNull PropertySetterDescriptor propertySetterDescriptor) {
-        JsFunction result = JsFunction.getAnonymousFunctionWithScope(
-                context().getScopeForDescriptor(propertySetterDescriptor));
+        JsFunction result = functionWithScope(context().getScopeForDescriptor(propertySetterDescriptor));
         JsParameter defaultParameter =
-                new JsParameter(propertyAccessContext(propertySetterDescriptor).enclosingScope().declareTemporary());
+                new JsParameter(propertyAccessContext(propertySetterDescriptor).jsScope().declareTemporary());
         JsStatement assignment = assignmentToBackingFieldFromParameter(context(), property, defaultParameter);
         result.setParameters(Arrays.asList(defaultParameter));
         result.setBody(AstUtil.convertToBlock(assignment));
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
index ce0e1e58870..bd369bc33ce 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
@@ -22,7 +22,8 @@ import org.jetbrains.k2js.translate.utils.BindingUtils;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.translate.utils.TranslationUtils.*;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.notNullCheck;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.translateInitializerForProperty;
 
 /**
  * @author Talanov Pavel
@@ -103,7 +104,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     @NotNull
     // assume it is a local variable declaration
     public JsNode visitProperty(@NotNull JetProperty expression, @NotNull TranslationContext context) {
-        JsName jsPropertyName = context.enclosingScope().declareName(getPropertyName(expression));
+        JsName jsPropertyName = context.declareLocalVariable(expression);
         JsExpression jsInitExpression = translateInitializerForProperty(expression, context);
         return AstUtil.newVar(jsPropertyName, jsInitExpression);
     }
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
index dae708e48c1..c5ab83de63f 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
@@ -3,7 +3,9 @@ package org.jetbrains.k2js.translate.expression;
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.k2js.translate.context.TemporaryVariable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.general.Translation;
@@ -11,6 +13,10 @@ import org.jetbrains.k2js.translate.general.Translation;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForElement;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.functionWithScope;
+
+
 /**
  * @author Talanov Pavel
  */
@@ -42,33 +48,30 @@ public final class FunctionTranslator extends AbstractTranslator {
         return new JsPropertyInitializer(functionName.makeRef(), function);
     }
 
-    //TODO: consider refactoring
     @NotNull
     public JsExpression translateAsLiteral() {
-        //TODO: provide a way not to pollute global namespace
-        JsName aliasForThis = context().enclosingScope().declareName("that");
-        context().aliaser().setAliasForThis(aliasForThis);
+        TemporaryVariable aliasForThis = context().newAliasForThis();
         JsFunction function = generateFunctionObject();
-        context().aliaser().removeAliasForThis();
-        JsExpression assignThatToThis = AstUtil.newAssignment(aliasForThis.makeRef(), new JsThisRef());
-        return AstUtil.newSequence(assignThatToThis, function);
+        context().removeAliasForThis();
+        return AstUtil.newSequence(aliasForThis.assignmentExpression(), function);
     }
 
     @NotNull
     private JsFunction generateFunctionObject() {
-        functionObject.setParameters(translateParameters(functionDeclaration.getValueParameters(),
-                functionObject.getScope()));
-        functionObject.setBody(translateBody());
+        TranslationContext innerContext = functionBodyContext();
+        functionObject.setParameters(translateParameters(functionDeclaration.getValueParameters(), innerContext));
+        functionObject.setBody(translateBody(innerContext));
         return functionObject;
     }
 
     private JsFunction createFunctionObject() {
         if (isDeclaration()) {
-            return JsFunction.getAnonymousFunctionWithScope
+            return functionWithScope
                     (context().getScopeForElement((JetDeclaration) functionDeclaration));
         }
         if (isLiteral()) {
-            return new JsFunction(context().enclosingScope());
+            //TODO: look into
+            return new JsFunction(context().jsScope());
         }
         throw new AssertionError("Unsupported type of functionDeclaration.");
     }
@@ -83,11 +86,11 @@ public final class FunctionTranslator extends AbstractTranslator {
     }
 
     @NotNull
-    private JsBlock translateBody() {
+    private JsBlock translateBody(@NotNull TranslationContext functionBodyContext) {
         JetExpression jetBodyExpression = functionDeclaration.getBodyExpression();
         //TODO decide if there are cases where this assert is illegal
         assert jetBodyExpression != null : "Function without body not supported";
-        JsNode body = Translation.translateExpression(jetBodyExpression, functionBodyContext());
+        JsNode body = Translation.translateExpression(jetBodyExpression, functionBodyContext);
         return wrapWithReturnIfNeeded(body, !functionDeclaration.hasBlockBody());
     }
 
@@ -124,19 +127,27 @@ public final class FunctionTranslator extends AbstractTranslator {
             return context().newPropertyAccess((JetPropertyAccessor) functionDeclaration);
         }
         if (isLiteral()) {
-            return context().newEnclosingScope(functionObject.getScope());
+            return context().innerJsScope(functionObject.getScope());
         }
         throw new AssertionError("Unsupported type of functionDeclaration.");
     }
 
     @NotNull
     private List<JsParameter> translateParameters(@NotNull List<JetParameter> jetParameters,
-                                                  @NotNull JsScope functionScope) {
+                                                  @NotNull TranslationContext functionBodyContext) {
         List<JsParameter> jsParameters = new ArrayList<JsParameter>();
         for (JetParameter jetParameter : jetParameters) {
-            JsName parameterName = functionScope.declareName(jetParameter.getName());
+            JsName parameterName = declareParameter(jetParameter, functionBodyContext);
             jsParameters.add(new JsParameter(parameterName));
         }
         return jsParameters;
     }
+
+    @NotNull
+    private JsName declareParameter(@NotNull JetParameter jetParameter,
+                                    @NotNull TranslationContext functionBodyContext) {
+        DeclarationDescriptor parameterDescriptor =
+                getDescriptorForElement(context().bindingContext(), jetParameter);
+        return context().declareLocalVariable(parameterDescriptor);
+    }
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
index e96f807491f..3fe95cc61e1 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
@@ -15,6 +15,7 @@ import java.util.List;
 /**
  * @author Talanov Pavel
  */
+//TODO: look into using temporary variable for counter
 public class WhenTranslator extends AbstractTranslator {
 
     @NotNull
@@ -35,7 +36,7 @@ public class WhenTranslator extends AbstractTranslator {
         super(context);
         this.whenExpression = expression;
         this.expressionToMatch = translateExpressionToMatch(whenExpression);
-        this.dummyCounterName = context.enclosingScope().declareTemporary();
+        this.dummyCounterName = context.jsScope().declareTemporary();
     }
 
     @NotNull
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
index d3d04f34b75..6e5134594d3 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java
@@ -2,11 +2,11 @@ package org.jetbrains.k2js.translate.initializer;
 
 import com.google.dart.compiler.backend.js.ast.JsFunction;
 import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import com.google.dart.compiler.backend.js.ast.JsStatement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.NamingScope;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 
@@ -21,12 +21,12 @@ public abstract class AbstractInitializerTranslator extends AbstractTranslator {
     @NotNull
     protected final InitializerVisitor visitor;
     @NotNull
-    protected final JsScope initializerMethodScope;
+    protected final NamingScope initializerMethodScope;
 
-    protected AbstractInitializerTranslator(@NotNull JsScope initializerMethodScope, @NotNull TranslationContext context) {
-        super(context.newEnclosingScope(initializerMethodScope));
+    protected AbstractInitializerTranslator(@NotNull NamingScope scope, @NotNull TranslationContext context) {
+        super(context.contextWithScope(scope));
         this.visitor = new InitializerVisitor();
-        this.initializerMethodScope = initializerMethodScope;
+        this.initializerMethodScope = scope;
     }
 
     abstract protected JsFunction generateInitializerFunction();
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
index 93e0bb352f8..3177efab070 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java
@@ -4,6 +4,7 @@ import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetDelegationSpecifier;
@@ -11,12 +12,14 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 import org.jetbrains.jet.lang.psi.JetParameter;
 import org.jetbrains.k2js.translate.context.Namer;
 import org.jetbrains.k2js.translate.context.TranslationContext;
-import org.jetbrains.k2js.translate.utils.BindingUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.functionWithScope;
+
 /**
  * @author Talanov Pavel
  */
@@ -28,15 +31,15 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
     private final List<JsStatement> initializerStatements = new ArrayList<JsStatement>();
 
     public ClassInitializerTranslator(@NotNull JetClass classDeclaration, @NotNull TranslationContext context) {
-        super(new JsScope(context.getScopeForElement(classDeclaration),
-                "initializer " + classDeclaration.getName()), context);
+        super(context.getScopeForElement(classDeclaration).innerScope
+                ("initializer " + classDeclaration.getName()), context);
         this.classDeclaration = classDeclaration;
     }
 
     @Override
     @NotNull
     protected JsFunction generateInitializerFunction() {
-        JsFunction result = JsFunction.getAnonymousFunctionWithScope(initializerMethodScope);
+        JsFunction result = functionWithScope(initializerMethodScope);
         //NOTE: that while we translate constructor parameters we also add property initializer statements
         // for properties declared as constructor parameters
         result.setParameters(translatePrimaryConstructorParameters());
@@ -52,7 +55,7 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
     }
 
     private void mayBeAddCallToSuperMethod() {
-        if (BindingUtils.hasAncestorClass(context().bindingContext(), classDeclaration)) {
+        if (hasAncestorClass(context().bindingContext(), classDeclaration)) {
             JetDelegatorToSuperCall superCall = getSuperCall();
             if (superCall == null) return;
             addCallToSuperMethod(superCall);
@@ -60,7 +63,8 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
     }
 
     private void addCallToSuperMethod(@NotNull JetDelegatorToSuperCall superCall) {
-        JsName superMethodName = initializerMethodScope.declareName(Namer.superMethodName());
+        //TODO: look into
+        JsName superMethodName = initializerMethodScope.jsScope().declareName(Namer.superMethodName());
         List<JsExpression> arguments = translateArguments(superCall);
         initializerStatements.add(AstUtil.convertToStatement
                 (AstUtil.newInvocation(AstUtil.thisQualifiedReference(superMethodName), arguments)));
@@ -83,10 +87,12 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
         return result;
     }
 
+    //TODO: util method
     @NotNull
     List<JsParameter> translatePrimaryConstructorParameters() {
+        List<JetParameter> parameterList = classDeclaration.getPrimaryConstructorParameters();
         List<JsParameter> result = new ArrayList<JsParameter>();
-        for (JetParameter jetParameter : classDeclaration.getPrimaryConstructorParameters()) {
+        for (JetParameter jetParameter : parameterList) {
             result.add(translateParameter(jetParameter));
         }
         return result;
@@ -94,7 +100,9 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
 
     @NotNull
     private JsParameter translateParameter(@NotNull JetParameter jetParameter) {
-        JsName parameterName = initializerMethodScope.declareName(jetParameter.getName());
+        DeclarationDescriptor parameterDescriptor =
+                getDescriptorForElement(context().bindingContext(), jetParameter);
+        JsName parameterName = initializerMethodScope.declareVariable(parameterDescriptor);
         JsParameter jsParameter = new JsParameter(parameterName);
         mayBeAddInitializerStatementForProperty(jsParameter, jetParameter);
         return jsParameter;
@@ -103,7 +111,7 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
     private void mayBeAddInitializerStatementForProperty(@NotNull JsParameter jsParameter,
                                                          @NotNull JetParameter jetParameter) {
         PropertyDescriptor propertyDescriptor =
-                BindingUtils.getPropertyDescriptorForConstructorParameter(context().bindingContext(), jetParameter);
+                getPropertyDescriptorForConstructorParameter(context().bindingContext(), jetParameter);
         if (propertyDescriptor != null) {
             initializerStatements.add
                     (TranslationUtils.assignmentToBackingFieldFromParameter
diff --git a/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java b/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
index 5e3c8c443b6..5dcf2d1a0df 100644
--- a/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java
@@ -1,12 +1,13 @@
 package org.jetbrains.k2js.translate.initializer;
 
 import com.google.dart.compiler.backend.js.ast.JsFunction;
-import com.google.dart.compiler.backend.js.ast.JsScope;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetNamespace;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 
+import static org.jetbrains.k2js.translate.utils.TranslationUtils.functionWithScope;
+
 /**
  * @author Talanov Pavel
  */
@@ -16,15 +17,15 @@ public final class NamespaceInitializerTranslator extends AbstractInitializerTra
     private final JetNamespace namespace;
 
     public NamespaceInitializerTranslator(@NotNull JetNamespace namespace, @NotNull TranslationContext context) {
-        super(new JsScope(context.getScopeForElement(namespace),
-                "initializer " + namespace.getName()), context);
+        super(context.getScopeForElement(namespace).innerScope
+                ("initializer " + namespace.getName()), context);
         this.namespace = namespace;
     }
 
     @Override
     @NotNull
     protected JsFunction generateInitializerFunction() {
-        JsFunction result = JsFunction.getAnonymousFunctionWithScope(initializerMethodScope);
+        JsFunction result = functionWithScope(initializerMethodScope);
         result.setBody(AstUtil.newBlock(translatePropertyAndAnonymousInitializers(namespace)));
         return result;
     }
diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
index 260e1c218ed..663bf97be5d 100644
--- a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java
@@ -1,13 +1,12 @@
 package org.jetbrains.k2js.translate.operation;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsName;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetUnaryExpression;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
+import org.jetbrains.k2js.translate.context.TemporaryVariable;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
 import org.jetbrains.k2js.translate.reference.AccessTranslator;
@@ -84,8 +83,8 @@ public abstract class IncrementTranslator extends AbstractTranslator {
     private JsExpression asPostfixWithReassignment() {
         // code fragment: expr(a++)
         // generate: expr( (t1 = a, t2 = t1, a = t1.inc(), t2) )
-        TemporaryVariable t1 = declareTemporary(accessTranslator.translateAsGet());
-        TemporaryVariable t2 = declareTemporary(t1.nameReference());
+        TemporaryVariable t1 = context().declareTemporary(accessTranslator.translateAsGet());
+        TemporaryVariable t2 = context().declareTemporary(t1.nameReference());
         JsExpression variableReassignment = variableReassignment(t1.nameReference());
         return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(),
                 variableReassignment, t2.nameReference());
@@ -95,8 +94,8 @@ public abstract class IncrementTranslator extends AbstractTranslator {
     private JsExpression asPostfixWithNoReassignment() {
         // code fragment: expr(a++)
         // generate: expr( (t1 = a, t2 = t1, t2.inc(), t1) )
-        TemporaryVariable t1 = declareTemporary(accessTranslator.translateAsGet());
-        TemporaryVariable t2 = declareTemporary(t1.nameReference());
+        TemporaryVariable t1 = context().declareTemporary(accessTranslator.translateAsGet());
+        TemporaryVariable t2 = context().declareTemporary(t1.nameReference());
         JsExpression methodCall = operationExpression(t2.nameReference());
         JsExpression returnedValue = t1.nameReference();
         return AstUtil.newSequence(t1.assignmentExpression(), t2.assignmentExpression(), methodCall, returnedValue);
@@ -110,35 +109,4 @@ public abstract class IncrementTranslator extends AbstractTranslator {
 
     @NotNull
     abstract JsExpression operationExpression(@NotNull JsExpression receiver);
-
-    //TODO: consider moving into context
-    protected final class TemporaryVariable {
-
-        @NotNull
-        private final JsExpression assignmentExpression;
-        @NotNull
-        private final JsName variableName;
-
-        private TemporaryVariable(@NotNull JsExpression initExpression) {
-            this.variableName = context().enclosingScope().declareTemporary();
-            this.assignmentExpression = AstUtil.newAssignment(variableName.makeRef(), initExpression);
-        }
-
-        @NotNull
-        public JsNameRef nameReference() {
-            return variableName.makeRef();
-        }
-
-        @NotNull
-        public JsExpression assignmentExpression() {
-            return assignmentExpression;
-        }
-    }
-
-    @NotNull
-    public TemporaryVariable declareTemporary(@NotNull JsExpression initExpression) {
-        return new TemporaryVariable(initExpression);
-    }
-
-
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
index 8a92d6c1cd8..48ab2f3c846 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
@@ -19,17 +19,11 @@ import java.util.List;
  */
 public final class ArrayAccessTranslator extends AccessTranslator {
 
-
     public static ArrayAccessTranslator newInstance(@NotNull JetArrayAccessExpression expression,
                                                     @NotNull TranslationContext context) {
         return new ArrayAccessTranslator(expression, context);
     }
 
-//    public static JsExpression translateAsArrayGet(@NotNull JetArrayAccessExpression expression,
-//                                                    @NotNull TranslationContext context) {
-//        return (new ArrayAccessTranslator(expression, context)).translateAsGet();
-//    }
-
     @NotNull
     private final JetArrayAccessExpression expression;
     @NotNull
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
index b421e1ab62c..4bca7ed2206 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
@@ -38,10 +38,9 @@ public class ReferenceTranslator extends AbstractTranslator {
     @NotNull
     //TODO: make this process simpler and clearer
     public JsExpression translateSimpleName() {
-        tryResolveAsAliasReference();
+        tryResolveAsAlias();
         tryResolveAsPropertyAccess();
-        tryResolveAsImplicitlyQualifiedExpression();
-        tryResolveAsLocalReference();
+        tryResolveAsReference();
         if (result != null) {
             return result;
         }
@@ -49,7 +48,7 @@ public class ReferenceTranslator extends AbstractTranslator {
     }
 
     //TODO: refactor
-    private void tryResolveAsImplicitlyQualifiedExpression() {
+    private void tryResolveAsReference() {
         if (alreadyResolved()) return;
 
         DeclarationDescriptor referencedDescriptor =
@@ -61,9 +60,11 @@ public class ReferenceTranslator extends AbstractTranslator {
         JsName referencedName = context().getNameForDescriptor(referencedDescriptor);
         JsExpression implicitReceiver = getImplicitReceiver(referencedDescriptor, context());
 
-        if (implicitReceiver == null) return;
-
-        result = AstUtil.qualified(referencedName, implicitReceiver);
+        if (implicitReceiver != null) {
+            result = AstUtil.qualified(referencedName, implicitReceiver);
+        } else {
+            result = context().getNameForDescriptor(referencedDescriptor).makeRef();
+        }
     }
 
     @Nullable
@@ -79,7 +80,7 @@ public class ReferenceTranslator extends AbstractTranslator {
         return context.declarations().getQualifier(referencedDescriptor);
     }
 
-    private void tryResolveAsAliasReference() {
+    private void tryResolveAsAlias() {
         //TODO: decide if this code is meaningful
         if (alreadyResolved()) return;
 
@@ -103,23 +104,4 @@ public class ReferenceTranslator extends AbstractTranslator {
 
         result = PropertyAccessTranslator.translateAsPropertyGetterCall(simpleName, context());
     }
-
-    private void tryResolveAsLocalReference() {
-        if (alreadyResolved()) return;
-
-        String name = getReferencedName();
-        JsName localReferencedName = TranslationUtils.getLocalReferencedName(context(), name);
-
-        if (localReferencedName == null) return;
-
-        result = localReferencedName.makeRef();
-    }
-
-    @NotNull
-    private String getReferencedName() {
-        String name = simpleName.getReferencedName();
-        assert name != null : "SimpleNameExpression should reference a name";
-        return name;
-    }
-
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
index bb9c429841d..8a1c2d32d75 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
@@ -272,4 +272,12 @@ public final class BindingUtils {
         return (FunctionDescriptor) descriptorForReferenceExpression;
     }
 
+    @NotNull
+    public static DeclarationDescriptor getDescriptorForElement(@NotNull BindingContext context,
+                                                                @NotNull JetElement element) {
+        DeclarationDescriptor descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
+        assert descriptor != null : element + " doesn't have a descriptor.";
+        return descriptor;
+    }
+
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
index 0e1f65b8777..bdec4be4d93 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
@@ -1,10 +1,16 @@
 package org.jetbrains.k2js.translate.utils;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * @author Talanov Pavel
  */
@@ -32,4 +38,24 @@ public final class DescriptorUtils {
     public static boolean isConstructorDescriptor(@NotNull FunctionDescriptor descriptor) {
         return (descriptor instanceof ConstructorDescriptor);
     }
+
+    @NotNull
+    public static List<DeclarationDescriptor> getOwnDeclarations(@NotNull ClassDescriptor classDescriptor) {
+        Collection<DeclarationDescriptor> allDescriptors =
+                classDescriptor.getDefaultType().getMemberScope().getAllDescriptors();
+
+        return filterByOwner(classDescriptor, allDescriptors);
+    }
+
+    @NotNull
+    private static List<DeclarationDescriptor> filterByOwner(@NotNull DeclarationDescriptor ownerDescriptor,
+                                                             @NotNull Collection<DeclarationDescriptor> allDescriptors) {
+        List<DeclarationDescriptor> resultingList = new ArrayList<DeclarationDescriptor>();
+        for (DeclarationDescriptor memberDescriptor : allDescriptors) {
+            if (memberDescriptor.getContainingDeclaration() == ownerDescriptor) {
+                resultingList.add(memberDescriptor);
+            }
+        }
+        return resultingList;
+    }
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
index ab6010c5125..15f7fadfaca 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
@@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.k2js.translate.context.Namer;
+import org.jetbrains.k2js.translate.context.NamingScope;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
 
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression;
+import static org.jetbrains.k2js.translate.utils.BindingUtils.getPropertyDescriptor;
 
 /**
  * @author Talanov Pavel
@@ -36,13 +37,6 @@ public final class TranslationUtils {
         return AstUtil.equals(expressionToCheck, nullLiteral);
     }
 
-    @Nullable
-    public static JsName getLocalReferencedName(@NotNull TranslationContext context,
-                                                @NotNull String name) {
-        return context.enclosingScope().findExistingName(name);
-    }
-
-
     @NotNull
     public static List<JsExpression> translateArgumentList(@NotNull TranslationContext context,
                                                            @NotNull List<? extends ValueArgument> jetArguments) {
@@ -65,19 +59,19 @@ public final class TranslationUtils {
     @NotNull
     public static JsNameRef backingFieldReference(@NotNull TranslationContext context,
                                                   @NotNull JetProperty expression) {
-        JsName backingFieldName = getBackingFieldName(getPropertyName(expression), context);
-        return getThisQualifiedNameReference(context, backingFieldName);
+        PropertyDescriptor propertyDescriptor = getPropertyDescriptor(context.bindingContext(), expression);
+        return backingFieldReference(context, propertyDescriptor);
     }
 
     @NotNull
     public static JsNameRef backingFieldReference(@NotNull TranslationContext context,
                                                   @NotNull PropertyDescriptor descriptor) {
-        JsName backingFieldName = getBackingFieldName(descriptor.getName(), context);
+        JsName backingFieldName = context.getNameForDescriptor(descriptor);
         if (BindingUtils.isOwnedByClass(descriptor)) {
             return getThisQualifiedNameReference(context, backingFieldName);
         }
         assert BindingUtils.isOwnedByNamespace(descriptor)
-                : "Only classes and namespaces may own descriptors";
+                : "Only classes and namespaces may own backing fields.";
         JsNameRef qualifier = context.declarations().getQualifier(descriptor);
         return AstUtil.qualified(backingFieldName, qualifier);
     }
@@ -91,13 +85,6 @@ public final class TranslationUtils {
         return propertyName;
     }
 
-    @NotNull
-    static private JsName getBackingFieldName(@NotNull String propertyName,
-                                              @NotNull TranslationContext context) {
-        String backingFieldName = Namer.getKotlinBackingFieldName(propertyName);
-        return context.enclosingScope().findExistingName(backingFieldName);
-    }
-
     @Nullable
     public static JsExpression translateInitializerForProperty(@NotNull JetProperty declaration,
                                                                @NotNull TranslationContext context) {
@@ -220,4 +207,9 @@ public final class TranslationUtils {
         return overloadedOperationReference;
     }
 
+    @NotNull
+    public static JsFunction functionWithScope(@NotNull NamingScope scope) {
+        return JsFunction.getAnonymousFunctionWithScope(scope.jsScope());
+    }
+
 }