Ongoing re-work of PayEx module