added check in flow, accepting waivers, payments and model/form for payments