better queries, organization and more