At minimum I Feel this logic should be elsewhere, not buried in the instructor app.