Feature payments

Merge the forgotten files