queries working at this point, tests pass, still need more tests and fix rules interface