And sectioned the old tank and extended it to add a little room for the fuel cell and fittings.
I've incorporated the cell, filter, reg and charcoal canister mounts into the lower tank section so the whole fuel system is a one piece bolt in unit, I should have it finished soon and will post some photos.