diff --git a/basis/functors/functors-modern.factor b/basis/functors/functors-modern.factor
new file mode 100644
index 0000000000..364a0e8a86
--- /dev/null
+++ b/basis/functors/functors-modern.factor
@@ -0,0 +1,95 @@
+! Copyright (C) 2008, 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors arrays assocs classes.mixin classes.parser
+classes.singleton classes.tuple classes.tuple.parser
+combinators effects.parser fry functors.backend generic
+generic.parser interpolate io.streams.string kernel lexer
+locals.parser locals.types macros make namespaces parser
+quotations sequences vocabs.parser words words.symbol ;
+IN: functors
+
+! This is a hack
+
+<PRIVATE
+
+TUPLE: fake-call-next-method ;
+
+TUPLE: fake-quotation seq ;
+
+GENERIC: >fake-quotations ( quot -- fake )
+
+M: callable >fake-quotations
+    >array >fake-quotations fake-quotation boa ;
+
+M: array >fake-quotations [ >fake-quotations ] { } map-as ;
+
+M: object >fake-quotations ;
+
+GENERIC: (fake-quotations>) ( fake -- )
+
+: fake-quotations> ( fake -- quot )
+    [ (fake-quotations>) ] [ ] make ;
+
+M: fake-quotation (fake-quotations>)
+    [ seq>> [ (fake-quotations>) ] each ] [ ] make , ;
+
+M: array (fake-quotations>)
+    [ [ (fake-quotations>) ] each ] { } make , ;
+
+M: fake-call-next-method (fake-quotations>)
+    drop \ method get literalize , \ (call-next-method) , ;
+
+M: object (fake-quotations>) , ;
+
+: parse-definition* ( accum -- accum )
+    parse-definition >fake-quotations suffix!
+    [ fake-quotations> first ] append! ;
+
+: parse-declared* ( accum -- accum )
+    scan-effect
+    [ parse-definition* ] dip
+    suffix! ;
+
+: (INTERPOLATE) ( accum quot -- accum )
+    [ scan-token interpolate-locals ] dip
+    '[ _ with-string-writer @ ] suffix! ;
+
+PRIVATE>
+
+DEFER: ;FUNCTOR delimiter
+
+<PRIVATE
+
+: push-functor-words ( -- )
+    functor-words use-words ;
+
+: pop-functor-words ( -- )
+    functor-words unuse-words ;
+
+: (parse-bindings) ( end -- words )
+    [ dup parse-binding dup ]
+    [ first2 [ make-local ] dip 2array ]
+    produce 2nip ;
+
+: with-bindings ( quot -- words assoc )
+    in-lambda? on H{ } make ; inline
+
+: parse-bindings ( end -- words assoc )
+    [
+        building get use-words
+        (parse-bindings)
+        building get unuse-words
+    ] with-bindings ;
+
+: parse-functor-body ( -- form )
+    push-functor-words
+    "WHERE" parse-bindings
+    [ [ swap <def> suffix ] { } assoc>map concat ]
+    [ [ \ ;FUNCTOR parse-until >quotation ] ((parse-lambda)) ] bi*
+    [ ] append-as
+    pop-functor-words ;
+
+: (FUNCTOR:) ( -- word def effect )
+    scan-new-word [ parse-functor-body ] parse-locals-definition ;
+
+PRIVATE>