Yeah this and the last episode could have been made into one. And then we'd get a whole episode following whatever Bayan is on about.
I'm holding out hope for if/when they return that the time has jumped to after the Sequel Trilogy so we can get something set in a different era.
__________________
|