The work continued with the fuel drain and fuel cap.
I didn’t like spending time in removing the fuel drain and fuel cap from the first tank since those were covered is a lot of tank sealant.
TAF sent me a new fuel drain and the 2 rings for the fuel cap.
The neck of the fuel cap was not separate available, I ordered this from Andair in the UK.
Long story short: I had to remove the parts from the first fuel tank and remove the cured tank sealant.