Personalization

@Berdir asked specifically to review this branch, please leave the merging to him.
Ah, yeah, I missed that we already merged a part of it, that's a bit unfortunate :)