Hmm I think the next ep will cover most of the Shikamaru fight, if not all.