Does anybody else get the feeling that when Red John said tyger, tyger in the season 2 finale, Bruno Heller had not come up with this whole tiger, tiger organization idea yet?

It feels like he's just added this whole other storyline recently..I'm a bit disheartened by all of this, he's always said he knew exactly what was going to happen from the beginning but it really doesn't look like it at the moment.

I don't know who to accuse any more, I just chose Brett Partridge because every other outcome will seem a bit boring to me..It could be Haffner though.