First cut at new mfsink