expanded HashStore stuff -- tests needed