Probably not done, but all the specs are passing!  Removed QueryBuilder and replaced with Query class.  Query can now take a session and users can now call session.query in order to get a query for that session.  Some improvements to the Query API as I went through the session shared specs