Added hashtesting and partially functional thing