Refactor to support iterating through questions