PAY-feat-39a14.3: Full rewrote of payment interface