Prep work for new mesh flow