WIP of data options migration