user list works pretty well now
fixed merge conflicts