More work on cloning current FS for install