Working on adding query recording to parser.