Working on preferences #BH-25 In Progress