Proto

Updated Criteria and queries, working on more complex queries and criteria to test functionality.