Merge
work in progress - user list functions