Ok, have implemented equation subsitution --- although it is causing some test case failures.  #231