I feel I worded that badly, sorry. 

I meant...tonight I thought you offered Haymitch to go check on Katniss when she's with Peeta on the roof. They'd go down and in doing so, Peeta would mention to Haymitch he wants to talk to him at some point (which would be "tomorrow" night).

Then the next day, we'd have the breakfast and training and whatever else we wanted to highlight with the gang and during lunch, Katniss and Gale would head up to their floor to eat together and Prim follows, makes up with Katniss who could go down to see Haymitch while Peeta stops Gale and Prim from leaving so he fills them in on his plan that is almost complete. Then we could skip to that night with Gale/Katniss talking about Prim, Haymitch/Peeta talking briefly, and probably some other interactions we want since now everyone is feeling much better, I assume. 

Does that look outlined better? Or am I being too detailed...? ^^;

Yeah I always figured they weren't allowed to leave...and your comment just made me imagine them all bolting out the door like in Rat Race. :( 

I should figure out who Chris Pine is, I've heard his name come up a lot.