The manga is covering this story to the end, and I believe is it is almost finished.