WIP adapting mb_spill to wotk with new FS