Significant work on supporting multiple questions, but not quite done