Move isCorrect logic to model