[UNFINISHED] Red changes, adding Solver class - need to add condition