Finishing PaymentTable. Closes #123