Payment (WIP). related to #2