More fleshing out of User

ooo, hashmaps! I feel like Dave...