refactored to allow randomized questions/answers again