Had a long talk today, followed by our first argument-type thing.
But it seems mostly good now.
We'll see what happens later.