SolverV1

Almost done