Editor's note: Apologies for the late start and for this being held so long, but we're working out a few technical bugs. Don't worry, there's tons of stuff on the way!

Today's Yesterday's episode of Hollyoaks begins with John Paul and Kieron waking up after spending the night together at Kieron's flat. J.P. is begging Kieron to forget about his priestly duties and spend the day with him, but Kieron insists he has "responsibilities" (so many lepers, so little time). He mentions that the wedding of Max and Steph is back on, and we hear the conversation we've all been waiting for:

Kieron: "I've got to go see Max and Steph, and sort out the final arrangements."

J.P.: "Max and Steph?"

Kieron: "Yeah, it's back on. I thought you'd know."

J.P.: "How would I know?"

Kieron: "From Craig. Isn't he coming to the wedding?"

J.P.: "I have no idea."

For the uninitiated, Craig is Steph's brother, and he also had a very complicated relationship with J.P.. I'm sure that as we get closer to his return in September, we'll start hearing his name mentioned more frequently.

After Kieron leaves, J.P. walks in on Niall having a Naomi Campbell-style snit fit, and assumes it's because Niall found about his Steph (with whom he was in love) getting married. Niall is becoming more and more tightly wound, and as hot as it is, when the truth comes out (that he's actually J.P.'s long lost brother), I have a feeling he's going to try and take as many people down as he can. And that includes J.P. and Kieron. As I've said before, Niall would be a good friend and sensitive guy if it wasn't for that whole "family-revenge-psycho-bloodbath" thing.

When Kieron gets home, J.P. and Niall are playing a video game. (J.P. really should have picked up on the fact that Niall is a little off. He kept mashing the buttons and yelling "die!" and "finishing move!"... they were playing My Little Pony.) The clip ends with J.P. and Kieron making up after their little squabble from the morning, and Niall inching closer to the deep end.

It's so good to have the guys back, and I love the fact that they can have these little tiffs, and it doesn't require the services of Cyndi Lauper to bring them back together.

You can see today's clip after the break, and hopefully things will keep heating up in Hollyoaks.