Initial work on converting to a dict of users