Reverting Atmos changes

I need to look at this in more detail; mapping changes will be a pain.
Revert "Reverting Atmos changes"

This reverts commit 2dce3e7873847c723684b55764969943c2dd05d8.