DeadAnimal- You are the man sir! That may just work! Ive been tring twist on style with the bayonettes.
The tank is an aftermarket 4 gal tank but no idea the brand! Its def not an old bmw or honda tank although one of those locking jap bike gas caps may work