biiiig update
new query interface, still mess - but much simpler