moved a bunch of stuff around and made a few changed to the query call records.