Once Zoro and Luffy + help finally (probably) vanquish the 2 Yonko the story might approach to the Final War arc, I bet we will most likely at least get to see Elbaf, wonder if necessarily before it comes to a start. Foremostly, an eye on the Vegapunk and CP0 matters as well should be dropped.