moving towards setting Query to handle what the Company class used to do