No longer using hardcoded max number or questions