added hashmap, and test for it