diff --git a/lib/src/chunk/ChunkEst.gf b/lib/src/chunk/ChunkEst.gf
new file mode 100644
index 000000000..8c7d38383
--- /dev/null
+++ b/lib/src/chunk/ChunkEst.gf
@@ -0,0 +1,43 @@
+concrete ChunkEst of Chunk = CatEst, ExtensionsEst [VPS,VPI] ** 
+  ChunkFunctor - [Prep_Chunk] with (Syntax = SyntaxEst), (Extensions = ExtensionsEst) **
+  open 
+    SyntaxEst, (E = ExtensionsEst), Prelude, 
+    ResEst, (P = ParadigmsEst) in {
+
+oper
+  emptyNP = mkNP (lin PN {s = \\_ => []}) ;
+
+-- overridden, to avoid the generation of dangling case endings
+lin
+  Prep_Chunk prep = mkAdv prep something_NP ;
+
+lin
+  NP_Acc_Chunk np = ss (np.s ! NPAcc) ;
+  NP_Gen_Chunk np = ss (np.s ! NPCase Gen) ;
+
+----  VPI_Chunk vpi = {s = vpi.s ! (VVIllat | VVInf)} ;
+
+lin
+  copula_inf_Chunk = ss "olla" ;
+
+  refl_SgP1_Chunk = ss "ise" ;
+  refl_SgP2_Chunk = ss "ise" ;
+  refl_SgP3_Chunk = ss "ise" ;
+  refl_PlP1_Chunk = ss "ise" ;
+  refl_PlP2_Chunk = ss "ise" ;
+  refl_PlP3_Chunk = ss "ise" ;
+  neg_Chunk = ss "ei" ;
+  copula_Chunk = ss "on" ;
+  copula_neg_Chunk = ss "ei ole" ;
+  past_copula_Chunk = ss "oli" ;
+  past_copula_neg_Chunk = ss "ei olnud" ;
+  future_Chunk = ss "tuleb" ;
+  future_neg_Chunk = ss "ei tule" ;
+  cond_Chunk = ss "oleks" ;
+  cond_neg_Chunk = ss "ei oleks" ;
+  perfect_Chunk = ss "on" ;
+  perfect_neg_Chunk = ss "ei ole" ;
+  past_perfect_Chunk = ss "oli" ;
+  past_perfect_neg_Chunk = ss "ei olnud" ;
+
+}
\ No newline at end of file
diff --git a/lib/src/translator/ExtensionsEst.gf b/lib/src/translator/ExtensionsEst.gf
new file mode 100644
index 000000000..a1c6803e9
--- /dev/null
+++ b/lib/src/translator/ExtensionsEst.gf
@@ -0,0 +1,168 @@
+--# -path=.:../abstract
+
+concrete ExtensionsEst of Extensions = 
+  CatEst ** open MorphoEst, ResEst, ParadigmsEst, SyntaxEst, (G = GrammarEst), (E = ExtraEst), Prelude in {
+
+flags coding = utf8 ;
+
+lincat
+  VPI = E.VPI ;
+  ListVPI = E.ListVPI ;
+  VPS = E.VPS ;
+  ListVPS = E.ListVPS ;
+  
+lin
+  MkVPI = E.MkVPI ;
+  ConjVPI = E.ConjVPI ;
+  ComplVPIVV = E.ComplVPIVV ;
+
+  MkVPS = E.MkVPS ;
+  ConjVPS = E.ConjVPS ;
+  PredVPS = E.PredVPS ;
+
+  BaseVPI = E.BaseVPI ;
+  ConsVPI = E.ConsVPI ;
+  BaseVPS = E.BaseVPS ;
+  ConsVPS = E.ConsVPS ;
+
+  GenNP = E.GenNP ;
+  GenIP = E.GenIP ;
+  GenRP = E.GenRP ;
+
+  PassVPSlash = E.PassVPSlash ;
+
+{- ---- rest TODO
+
+  PassAgentVPSlash = E.PassAgentVPSlash ;
+
+----  EmptyRelSlash = E.EmptyRelSlash ;
+
+lin
+    ComplVV v ant pol vp = 
+      insertObj 
+        (\\_,b,a => infVPGen pol.p v.sc b a vp (vvtype2infform v.vi)) 
+        (predSV {s = v.s ; 
+                sc = case vp.s.sc of {
+                  NCNom => v.sc ;   -- minun täytyy pestä auto
+                  c => c                 -- minulla täytyy olla auto
+                  } ;
+                h = v.h ; p = v.p
+               }
+         ) ;
+
+  CompoundN noun cn = {
+    s = \\nf => noun.s ! 10 ++ BIND ++ cn.s ! nf ;
+    h = cn.h
+    } ;
+
+  CompoundAP  noun adj = {
+    s = \\_ => (snoun2nounSep {s = \\f => noun.s ! 10 ++ BIND ++ adj.s ! Posit ! sAN f ; h = adj.h}).s
+    } ;
+
+  PresPartAP vp = { ---- many things can go wrong here...
+    s = \\bool,nform => 
+         vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext ++ 
+         (sverb2verbSep vp.s).s ! PresPartAct (AN nform)
+    } ;
+
+  PredVPosv np vp = mkCl np vp ; ----
+
+  -- Ant -> Pol -> VPSlash -> RS ; --- here replaced by a relative clause 
+  PastPartRS ant pol vps = mkRS ant pol (mkRCl which_RP (E.PassVPSlash (lin VPSlash vps))) ;
+
+  ApposNP np1 np2 = {
+      s = \\c => np1.s ! c ++ "," ++ np2.s ! c ;
+      a = np1.a ;
+      isPron = np1.isPron ; isNeg = np1.isNeg
+      } ;
+
+  GerundNP vp = {         
+    s = \\c => vp.s2 ! True ! Pos ! agrP3 Sg ++ (mkNP the_Det (lin N (sverb2snoun vp.s))).s ! c ++ vp.adv ! Pos ++ vp.ext ; 
+    a = agrP3 Sg ;
+    isPron = False ; isNeg = False
+    } ;
+-- sen sanominen suoraan että... 
+---- se --> sen
+---- lost agreement, lost genitive, lost possessive
+---- minun saamiseni mukaan
+  
+  GerundAP vp = {s = \\f => vp.s2 ! True ! Pos ! agrP3 Sg ++ (snoun2nounSep (sverb2nounPresPartAct vp.s)).s ! f ++ vp.adv ! Pos ++ vp.ext} ;
+
+  GerundAdv vp = {s = (sverb2verbSep vp.s).s ! Inf Inf2Instr ++ vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext} ; -- nukkuen
+
+  WithoutVP vp = {s = (sverb2verbSep vp.s).s ! Inf Inf3Abess ++ vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext} ; -- nukkumatta
+  InOrderToVP vp = {
+    s = (sverb2verbSep vp.s).s ! Inf Inf1Long ++ Predef.BIND ++ "en" ++ vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext
+    } ; -- nukkuakseen --- agr
+  ByVP vp = {s = (sverb2verbSep vp.s).s ! Inf Inf3Adess ++ vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext} ; -- nukkumalla
+
+-- tänään löydetty
+  PastPartAP vp = {s = \\_,f => vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ (sverb2verbSep vp.s).s ! PastPartPass (AN f) ++ vp.ext} ;
+
+-- miehen tänään löytämä
+  PastPartAgentAP vp np = 
+    {s = \\_,f => np.s ! NPCase Gen ++ vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ (sverb2verbSep vp.s).s ! AgentPart (AN f) ++ vp.ext} ;
+
+
+  OrdCompar a = snoun2nounSep {s = \\nc => a.s ! Compar ! SAN nc ; h = a.h} ; 
+
+  PositAdVAdj a = {s = a.s ! Posit ! SAAdv} ;  -- A -> AdV really
+
+  UseQuantPN quant pn = {
+      s = \\c => let k = (npform2case Sg c) in
+                 quant.s1 ! Sg ! k ++ snoun2np Sg pn ! c ++ quant.s2 ! pn.h ; 
+      a = agrP3 Sg ;
+      isPron = False ; 
+      isNeg = quant.isNeg
+      } ;
+
+  SlashV2V v ant p vp = 
+      insertObj (\\_,b,a => infVP v.sc b a vp (vvtype2infform v.vi)) (predSV v) ** {c2 = v.c2} ; ----
+      ---- insertObj (\\_,b,a => infVPGen p.p v.sc b a vp v.vi) (predSV v) ** {c2 = v.c2} ;
+
+  CompS s = {s = \\_ => "että" ++ s.s} ;  -- S -> Comp            ---- what are these expected to do ? 29/3/2013
+  CompVP ant pol vp = {s = \\a => infVPGen pol.p vp.s.sc Pos a vp Inf1} ; -- VP -> Comp
+
+
+  that_RP = which_RP ;
+  no_RP = which_RP ;
+
+  UttAdV a = a ;
+
+  UncNeg = negativePol ;
+
+  PresPartRS ant pol vp = mkRS ant pol (mkRCl which_RP vp) ;  ---- present participle attr "teräviä ottava"
+
+     PredVPosv np vp = mkCl np vp ; ---- OSV yes, but not for Cl
+     PredVPovs np vp = mkCl np vp ; ---- SVO
+
+   EmptyRelSlash cls = mkRCl which_RP cls ;
+
+  CompQS qs = {s = \\_ => qs.s} ;
+
+
+  AdAdV ada adv = {s = ada.s ++ adv.s} ;
+
+   SlashVPIV2V v pol vpi = -- : V2V -> Pol -> VPI -> VPSlash ;
+      insertObj (\\_,b,a => vpi.s ! v.vi) (predSV v) ** {c2 = v.c2} ;
+
+   VPSlashVS v vp = -- : VS -> VP -> VPSlash ; -- hän sanoo (minun) menevän (!) ---- menneen ?
+      insertObj (\\_,b,a => infVP v.sc b a vp InfPresPart) (predSV v) ** 
+                   {c2 = mkPrep []} ;
+     
+--   SlashSlashV2V v ant pol vps = -- : V2V -> Ant -> Pol -> VPSlash -> VPSlash ; --- not implemented in Eng so far
+--      insertObj (\\_,b,a => infVPGen pol.p v.sc b a vps v.vi) (predSV v) ** {c2 = v.c2} ; --- or vps.c2 ??
+
+--in Verb,   SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash
+
+  DirectComplVS t np vs utt = 
+    mkS (lin Adv (optCommaSS utt)) (mkS t positivePol (mkCl np (lin V vs))) ;
+
+  DirectComplVQ t np vs q = 
+    mkS (lin Adv (optCommaSS (mkUtt q))) (mkS t positivePol (mkCl np (lin V vs))) ;
+
+  FocusObjS np sslash = 
+    mkS (lin Adv (optCommaSS (ss (appCompl True Pos sslash.c2 np)))) <lin S sslash : S> ; ---- Pos could be Neg: häntä minä en tunne
+-}
+
+}
diff --git a/lib/src/translator/TranslateEst.gf b/lib/src/translator/TranslateEst.gf
new file mode 100644
index 000000000..5e8e66945
--- /dev/null
+++ b/lib/src/translator/TranslateEst.gf
@@ -0,0 +1,58 @@
+--# -path=.:../chunk
+
+concrete TranslateEst of Translate = 
+  TenseX,
+  CatEst,
+  NounEst - [
+    PPartNP
+    ],
+  AdjectiveEst,
+  NumeralEst,
+  SymbolEst [
+    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
+    ],
+  ConjunctionEst,
+  VerbEst -  [
+    UseCopula,  -- not used  
+--    CompAP,  -- variant Nom/Part, in Finnish
+    PassV2  -- generalized in Extensions
+    ],
+  AdverbEst,
+  PhraseEst,
+  SentenceEst,
+  QuestionEst,
+  RelativeEst,
+  IdiomEst,
+  ConstructionEst,
+  DocumentationEst,
+
+  ChunkEst,
+  ExtensionsEst [
+    ListVPS,BaseVPS,ConsVPS,ConjVPS,ListVPI,BaseVPI,ConsVPI,ConjVPI,
+      CompoundN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP,
+      DirectComplVS, DirectComplVQ, FocusObjS
+    , PastPartAP, PastPartAgentAP, PresPartAP, GerundNP, GerundAdv
+    , WithoutVP, InOrderToVP, ByVP
+  ],
+
+  DictionaryEst ** 
+
+open MorphoEst, ResEst, ParadigmsEst, SyntaxEst, (E = ExtraEst), (G = GrammarEst), Prelude in {
+
+flags literal=Symb ; coding = utf8 ;
+
+{-
+--- in Estonian, too?
+
+lin
+  CompAP ap = G.CompAP ap 
+    | 
+   {s = \\agr => 
+          let
+            n = complNumAgr agr ;
+            c = Part ;
+          in ap.s ! False ! (NCase n c)
+      } ;
+-}
+}
+