basic query response working
fixed conflicts, merged