Most of the way to getting payments fully integrated