fixup! payments architecture