Wip/userprefs changes -- DO NOT MERGE