WIP -- Revamped Pref and persistance