diff --git a/create-core-with-swank.lisp b/create-core-with-swank.lisp
new file mode 100644
index 0000000..fb6f3fe
--- /dev/null
+++ b/create-core-with-swank.lisp
@@ -0,0 +1,27 @@
+(mapc 'require '(sb-bsd-sockets sb-posix sb-introspect sb-cltl2 asdf))
+
+(defun quicklisp-setup ()
+  (let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
+    (when (probe-file quicklisp-init)
+        (load quicklisp-init))))
+
+(quicklisp-setup)
+
+(defun slime-setup ()
+  (let ((slime-directory (merge-pathnames "common-lisp/slime/" (user-homedir-pathname)))
+        (slime-git-url "https://github.com/slime/slime.git")
+        (slime-tag "v2.30"))
+
+    (unless (probe-file slime-directory)
+      (ensure-directories-exist slime-directory)
+      (uiop:run-program (format nil "git clone -b ~a ~a ~a" slime-tag slime-git-url slime-directory)))
+
+    (let ((swankloader (merge-pathnames "swank-loader.lisp" slime-directory)))
+      (when (probe-file swankloader)
+        (load swankloader)))))
+
+(slime-setup)
+
+(ql:quickload :dev.metalisp.survey)
+(swank-loader:dump-image "sbcl.core-with-swank")
+(quit)
diff --git a/create-core.lisp b/create-core.lisp
index fb6f3fe..98a69fd 100644
--- a/create-core.lisp
+++ b/create-core.lisp
@@ -7,21 +7,6 @@
 
 (quicklisp-setup)
 
-(defun slime-setup ()
-  (let ((slime-directory (merge-pathnames "common-lisp/slime/" (user-homedir-pathname)))
-        (slime-git-url "https://github.com/slime/slime.git")
-        (slime-tag "v2.30"))
-
-    (unless (probe-file slime-directory)
-      (ensure-directories-exist slime-directory)
-      (uiop:run-program (format nil "git clone -b ~a ~a ~a" slime-tag slime-git-url slime-directory)))
-
-    (let ((swankloader (merge-pathnames "swank-loader.lisp" slime-directory)))
-      (when (probe-file swankloader)
-        (load swankloader)))))
-
-(slime-setup)
-
 (ql:quickload :dev.metalisp.survey)
-(swank-loader:dump-image "sbcl.core-with-swank")
+(sb-ext:save-lisp-and-die #P"ml-survey.core")
 (quit)