Feature/users

My awesome new feature has arrived!