Almost finished CrossSolver