Included equation of state. Planning better structure for solver.