Unified Payment code

for activities and freestyle
ooops - will do in future PR