That sounds good to me :3

About Haymitch staying with her? You could have her contemplating her own weird feelings, or have them talk about something until she feels better from her nightmare?