First iteration of rewrite to use qfs instead of puffs.