WIP: separate verification from payment