Move environment out of payload.
Merge pull request #3 from remind101/environment

Move environment out of payload.