query parser was a bit silly
continuing
continuing
cleanup
cleanup