Not long ago I bought an 01 Grand Cherokee that went dim on me out at stop of San Felipe Road fewer than 500' from my gate. Now it requirements drivers door and front fender exact aspect. Your CJ seems like a great deal of time and skill in it. https://premiumpartsdepot.com/product-tag/2015-jeep-wrangler-4-door-hardtop/