#41

I've done some basic testing.
One of you will have to work on "User". I'm not very comfortable with that and I'm afraid of breaking things! :p