got rid of static data, changed to queries.