Added more user stuff.
Merge pull request #4 from mlindegarde/converting-to-users

Added more user stuff.