Closes #1010 (closed)
Add base class for all payable objects
This will create a new commit in order to revert the existing changes.
