diff --git a/src/ikarus.apply.ss b/src/ikarus.apply.ss
index db3b377..22a5249 100644
--- a/src/ikarus.apply.ss
+++ b/src/ikarus.apply.ss
@@ -4,7 +4,7 @@
   (import 
     (except (ikarus) apply)
     (ikarus system $pairs)
-    (ikarus system $apply))
+    (ikarus system $stack))
 
   (define apply
     (let ()
diff --git a/src/ikarus.boot b/src/ikarus.boot
index 86f1b31..be11e3d 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/ikarus.control.ss b/src/ikarus.control.ss
index b03813d..4c2bbfc 100644
--- a/src/ikarus.control.ss
+++ b/src/ikarus.control.ss
@@ -3,8 +3,7 @@
 (library (ikarus control)
   (export call/cf call/cc dynamic-wind exit)
   (import 
-    (only (scheme) $fp-at-base $current-frame $frame->continuation
-          $seal-frame-and-call)
+    (ikarus system $stack)
     (except (ikarus) call/cf call/cc dynamic-wind exit))
 
   (define primitive-call/cf
diff --git a/src/makefile.ss b/src/makefile.ss
index 2b67b2e..cf1356f 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -111,9 +111,8 @@
       [$codes (ikarus system $codes)]
       [$tcbuckets (ikarus system $tcbuckets)]
       [$io (ikarus system $io)]
-      [$apply (ikarus system $apply)]
       [$arg-list (ikarus system $arg-list)]
-      ;[$lists (ikarus system $lists)]
+      [$stack (ikarus system $stack)]
       ;[$lists (ikarus system $lists)]
       ;[$lists (ikarus system $lists)]
       ))
@@ -531,21 +530,22 @@
       [$read-char             $io]
       [$peek-char             $io]
       [$unread-char           $io]
-      ; (ikarus system $apply)
-      [$$apply                $apply]
+      ; (ikarus system $arg-list)
       [$arg-list              $arg-list]
+      ; (ikarus system $stack)
+      [$$apply                          $stack]
+      [$fp-at-base                      $stack]
+      [$primitive-call/cc               $stack]
+      [$frame->continuation             $stack]
+      [$current-frame                   $stack]
+      [$seal-frame-and-call             $stack]
+      [$make-call-with-values-procedure $stack]
+      [$make-values-procedure           $stack]
       ; (ikarus system)
       [$forward-ptr?                    s  ]
       [$unbound-object?                 s  ]
-      [$make-call-with-values-procedure s  ]
-      [$make-values-procedure           s  ]
       [$interrupted?                    s  ]
       [$unset-interrupted!              s  ]
-      [$fp-at-base                      s  ]
-      [$primitive-call/cc               s  ]
-      [$frame->continuation             s  ]
-      [$current-frame                   s  ]
-      [$seal-frame-and-call             s  ]
       [$apply-nonprocedure-error-handler s]
       [$incorrect-args-error-handler     s]
       [$multiple-values-error            s]