diff --git a/common/func_ICA.sh b/common/func_ICA.sh
index 22cb790..0713c50 100644
--- a/common/func_ICA.sh
+++ b/common/func_ICA.sh
@@ -27,51 +27,98 @@ wrt_iterations() {                 #
 
   for ((N=1; N <= ITERATIONS ; N++)) ; do # Double parentheses,
                                           # and "ITERATIONS" with no "$".
-   ITERATION=iteration-$N
-   if [ "$N" = "1" ] ; then
-(
-    cat << EOF
-$ITERATION:  chapter06
-	@do_ica_prep
-	@pushd logs && \\
-	mkdir $ITERATION && \\
-	mv $system_rebuild $ITERATION && \\
-	popd
-	@rm -f $system_rebuild
-	@touch \$@
-
-EOF
-) >> $MKFILE
+    ITERATION=iteration-$N
+    if [ "$N" = "1" ] ; then
+      echo "$ITERATION:  chapter06" >> $MKFILE
+      wrt_prepare        "$ITERATION"
+      wrt_logs_and_clean "$ITERATION"
+      echo -e "\t@touch \$@\n" >> $MKFILE
       PREV=$ITERATION
     elif [ "$N" = "$ITERATIONS" ] ; then
-(
-    cat << EOF
-iteration-last: $PREV  ICA_rebuild
-	@do_ica_prep
-	@pushd logs && \\
-	mkdir iteration-last && \\
-	cp $system_rebuild iteration-last && \\
-	popd
-	@do_ica_work
-	@touch \$@
-
-EOF
-) >> $MKFILE
+      echo "iteration-last:  $PREV  system_rebuild" >> $MKFILE
+      wrt_prepare        "$ITERATION"
+      wrt_logs           "$ITERATION"
+      #I need to gigure out how to handle this for ITERATIONS > 2
+      # @do_ica_work $1 $2
+      # @farce $1 $2
+      echo -e "\t@touch \$@\n" >> $MKFILE
     else
-(
-    cat << EOF
-$ITERATION: $PREV  ICA_rebuild
-	@do_ica_prep
-	@pushd logs && \\
-	mkdir $ITERATION && \\
-	mv $system_rebuild $ITERATION && \\
-	popd
-	@rm -f $system_rebuild
-	@touch \$@
-
-EOF
-) >> $MKFILE
+      echo "$ITERATION:  $PREV  system_rebuild" >> $MKFILE
+      wrt_prepare        "$ITERATION"
+      wrt_logs_and_clean "$ITERATION"
+      echo -e "\t@touch \$@\n" >> $MKFILE
       PREV=$ITERATION
     fi
   done
 }
+
+#----------------------------------#
+wrt_prepare() {                    #
+#----------------------------------#
+  local ITERATION=$1
+
+  if [[ "$PROGNAME" = "CLFS" ]] && [[ "$METHOD" = "boot" ]] ; then
+    local PRUNEPATH="/jhalfs /sources /var/log/paco /opt /dev /home /mnt /proc \
+/root /sys /tmp /usr/src /lost+found /tools"
+    local ROOT_DIR=/
+    local DEST_TOPDIR=/jhalfs
+  else
+    local PRUNEPATH="$BUILDDIR/jhalfs $BUILDDIR/sources $BUILDDIR/var/log/paco \
+$BUILDDIR/opt $BUILDDIR/dev $BUILDDIR/home $BUILDDIR/mnt \
+$BUILDDIR/proc $BUILDDIR/root $BUILDDIR/sys $BUILDDIR/tmp \
+$BUILDDIR/usr/src $BUILDDIR/lost+found $BUILDDIR/tools"
+    local ROOT_DIR=$BUILDDIR
+    local DEST_TOPDIR=$BUILDDIR/jhalfs
+  fi
+
+  if [[ "$RUN_ICA" = "1" ]] ; then
+    local DEST_ICA=$DEST_TOPDIR/ICA && \
+(
+    cat << EOF
+	@extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION \\
+	extras/do_ica_prep $DEST_ICA/$ITERATION
+EOF
+) >> $MKFILE
+  fi
+
+  if [[ "$RUN_FARCE" = "1" ]] ; then
+    local DEST_FARCE=$DEST_TOPDIR/farce && \
+(
+    cat << EOF
+	@extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION \\
+	extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/$ITERATION.filelist
+EOF
+) >> $MKFILE
+  fi
+}
+
+#----------------------------------#
+wrt_logs_and_clean() {             #
+#----------------------------------#
+  local ITERATION=$1
+
+(
+    cat << EOF
+	@pushd logs && \\
+	mkdir $ITERATION && \\
+	mv $system_rebuild $ITERATION && \\
+	popd
+	@rm -f $system_rebuild
+EOF
+) >> $MKFILE
+}
+
+#----------------------------------#
+wrt_logs() {             #
+#----------------------------------#
+  local ITERATION=$1
+
+(
+    cat << EOF
+	@pushd logs && \\
+	mkdir $ITERATION && \\
+	cp $system_rebuild $ITERATION && \\
+	popd
+EOF
+) >> $MKFILE
+}