I found an 85 Golf with a 1.6 NA diesel at a local wrecking yard. I was told the engine runs but smokes a bit. ACH gearbox. Body trashed but I can pull engine and transaxle if you want them (for a small fee) or you can go get em yer self. Pointa Vista Service. 604 858 3814. Also has a 92 Jetta gasser with an automatic if anyone is interested in those. That car has very clean interior and many usable parts.