added payments, need to merge with master
merge complete