wiggydiggy
Guru
Wiki says that Moffat wrote those two!
p.s. have you put a spoiler in your posts? I think you messed up the formatting, it's gone very odd at this end ...
EDIT: interesting stuff:
The Hugo Award-nominated episode is also significant for introducing the character of River Song, who went on to play an important role in future stories.
Oh yeah Moff wrote it, but did RTD tell him to put certain plot/dialogue in to sow the seed for later or was it more of a happy accident?
I've removed the spoiler as its not working apparently.