Reorganize equilibrium calculation into Equilibrium class. Still needs some work before we get a result.