Just see this arc as a movie that is spread out across several episodes. It is just a side story.