Finishing touches on Payment