Refactor User and PrivilegeLevel. Fix a whole lot of things.