fix up a template that they can fill in
fix it up so alipay can be wired into this stuff
merge change from master