WYCS: working through and optimising the solver code.  It's annoying though because it makes the code *less* readable.