Improvements to Model interface
Fixes for recursive variable substitution and an initial attempt at an equilibrium interface