Add the payway stuff
Merge remote-tracking branch 'origin/currinda' into currinda