Userlist

Added in User objects and completely redid UserList to match