Wagon is a piece of cake, you can use a Commodore fuel tank with in-tank pump. PM me and i'll send you some info.