Adds starting point for payment modal, merges in changes to master