Thank god.
All that aside, having Shanks around is a bit exciting. Can't say I expected it. I always saw meeting up with Shanks as an "at the end of the journey" thing.
I feel that Luffy is probably going to stay unconscious the whole time Shanks is here, and will possibly wake up in Law's company? That's where it feels like the story is going to me. Thank god Shanks is here to end the war, because I think it needs a bit of ending.