added query framework - need to add test