Some progress on the association/query building.