Ready-State v.1.0
Merge branch 'Step3-redesignPayment'