We made up. I'm still a little mad, but for the sake of peace.....
Packing furiously. Ahh! I leave tomorrow! :).