WYRL: the solver now compiles again ... but it doesn't work yet.