#516- Working on Question Type logic.