Modified train_val and solver files, now we use a validation set