Usersprofile

Having a look at the changes I've made, it looks like I've only ever updated my own stuff, so there shouldn't really be any conflicts if I merge this to the master. As in its all additions/internal changes.