fixup! fixup! payments architecture