Hash map items, instead of just map keys
Expand test to include testing of hash
Expand Service tests
Improve tests for Service
Add basic QID implementation