mid-refactor - added checks for quiz join, etc.