Redo of data update to use the new envionment sound.

There will be more commits to this PR so let me comment when finished for actual merge,
added it as a PR for review.