Major update to filesystem grabbing