wip
wip
fixed bugs, now working with hashing