But he filled it from a large flask on the table -- if the poison was in the goblet prior to the wine then it would explain why everyone else drinking from that wasnt keeling over. Also, there's a reason Sansa asks Tyrion to leave early and I think it's because she knew what was about to happen.

That's what I've assumed his story was leading to since the beginning.

So I downloaded the episode to rewatch it instead of using HBO Go again, and I just caught something very interesting.

At 29:18, during the wedding, the Pastor says, "Cursed be he who seeks to tear them asunder." He is referring to Joffrey and the Queen. The camera pulls focus and this is what you see.

VERY INTERESTING

http://i.imgur.com/xT1nHvw.png

Edit: I rewatched, Pycelle wasn't talking in Oberin's ear, but I think there is significance to he and Olenna stand out during when this line is said.

Could be. I'd love that.

An odd pair to be discussing anything.

I retracted that part.

After rewatching, my #1 culprit is Cersei and my #2 is Olenna.

Cersei tells Pycell that the food will be fed to the dogs, and he says, "but the queen said feed it to the people." She replies with, "The queen is telling you to feed it to the dogs."

When Tyrion pours the wine for Joffrey, the camera is on Cersei's face and she has a guilty look.

I also noticed that Joffrey was the only one to eat the pie, so it might have been in the pie, not the goblet.

I'd say the poison was definitely in the pie

Book readers just can't help themselves, can they? It was a rhetorical question, not looking for the answer.

No doubt in my mind, and what was with the quick close up of the pie after Joffrey had cut it with his sword. I've watched it twice and still don't see why the close up was necessary. Also, was clear that Margery fed the pie to Joffrey while not eating any herself.

I thought the focus was on the doves he'd killed when he sliced the pie open with Widow's Wail.

That's probably it, I just missed it.

Yes I did notice that as well -- and you are a correct that it was a completely unnecessary shot given what was subsequently shown. I thought it was showing bird shit in the pie or something and that would be Joffrey's latest demeaning of Tyrion or Sansa but no. It was a weird shot I give you that.

I say Cersei (my first gut guess) or Sansa (the one who I would love for it to be)...

Maybe.

I thought the shot of the pie was to show dead doves that had eaten the pie....