started making skeleton for query.js + minor edits