Yep. Did you read my link a few posts up?
I have now!
I have a good guess at how he's going to "fix" this little turn events and have her as his new companion, I have my theory. But, one thing I've learned with this show, is that you can expect the logical course of events, just about as frequently as you can expect the absolutely unexpected.... and I LOVE THAT!