Equation class, plus standardized the api