Yep. We're no longer fighting, and I'll get to see him again in two weeks. :3