final commit, hashmap appears to be working