Add HAsh as a value type, fix up relatioship labels
merge conflicts