intermediate work on reconfiguring query load logic.
Update skeleton logic