making this commit to save latest work. This commit attempted to fix
the Hash bugs