Added main, diffops and SolverParameters