Payment branch #1

Fixes #59 
Fixes #60