Rowan Freemaker is finally right where he belongs: making cool ships for the Rebels. In this exclusive clip from the first episode of Season 2 of LEGO Star Wars: The Freemaker Adventures, our hero gets to meet living legend and creator of the B-wing fighter, Quarrie, whom he takes on a salvage run with the family.

Quarrie was first introduced in Star Wars Rebels. He and General Syndulla have a shared history, so she knows better than anyone that Quarrie’s the perfect choice to help Rowan build his Arrowhead. Of course, a Force-sensitive young boy with a penchant for trouble might be more of a hindrance than a help to an aging shipbuilder, but isn’t that half the fun?

Traditionally, master-apprentice relationships don’t end so well in the Star Wars universe (the Emperor, Obi-Wan, Anakin, Yoda…), but maybe Rowan (Nicholas Cantu) and Quarrie (Corey Burton, who also played him on Rebels) can break that streak.

Season 2 of LEGO Star Wars: The Freemaker Adventures airs Monday, July 31, at 7 a.m. on Disney XD. There will be a preview of the episode on Saturday, June 17, at 11 a.m.