[WIP] add back payments