More test.. more methods... Added some indexing capabilities to the Query Builder but they are incomplete or still failing some tests.