When I watched this episode on YouTube a couple weeks ago, I didn't realize it was a two parter... and I about died at the end. Like you said Moffat is amazing with suspense and both episodes had me on the edge of my seat!!

River is a fascinating character. I wonder if Moffat will bring her back later on or if she will always remain a mystery!