1. Add features for make-payment branch