Changed "where" class to public within query. Updated parser to read in queries and began work on parsing into query class.