I'm such a Moffat fangirl--all the connections are like crack. And just when you think you've exhausted it all, up comes something like this. <3

Yeah you're in for a toughie, with CoE, though you've probably been warned already.
It was pretty much impossible to hang around the Doctor Who fandom and not get spoiled, but thanks for the warning.