WYRL: ok the full solver now compiles, although it's very difficult to tell whether it actually works or not!!