Pardon me if I missed this discussion (I haven’t had time to read the entire thread yet) but for the cargo shuttle replacement is Ady using the Zeta-class cargo shuttle from Rogue One or the Sentinel-class shuttle from A New Hope Special edition? Just curious. Overly curious. But I can wait.
It will be a cross between the Tydirium and the Zeta class.